Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code update #37

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
269a557
Fault: creation of md5salt from given password
AdminChucky Apr 18, 2024
d165533
Fix: Use Md5 new interface, and fmt
MiguelHorta Apr 19, 2024
6afde1c
Fix: visual studio include error
AdminChucky Apr 19, 2024
6603de4
Merge branch 'citymania-org:master' into origin_14.x
AdminChucky Apr 19, 2024
5782b84
Merge branch 'citymania-org:master' into origin_14.x
AdminChucky Apr 20, 2024
c7daaa1
Feature: login window for identified community
AdminChucky Apr 23, 2024
93871cc
Merge branch 'citymania-org:master' into origin_14.x
AdminChucky Apr 26, 2024
e776135
fix: Login uri was impossible to change
MiguelHorta Apr 25, 2024
f9a2f4e
Add: Admin login for n-ice/btpro
AdminChucky May 6, 2024
b11f5a7
Update branch
AdminChucky May 6, 2024
ab587a1
Fix: merge error (ninja build stopped)
AdminChucky May 6, 2024
a4c524d
Add: admin company buttons
AdminChucky May 15, 2024
472cac5
Fix polyrail endpoint update when removing
ldpl May 10, 2024
15475d6
Adjusting of the code.
AdminChucky Jun 2, 2024
a52c2f1
Add: join last server from intro menue
AdminChucky Jun 2, 2024
349322c
fix: redrawing admin company buttons; hang windows to parent window; …
AdminChucky Jun 3, 2024
c2dbe39
Add: station catchment area with ctrl+click
AdminChucky Jun 5, 2024
740b6a4
Fix: crash when APM toggled in intro screen
MiguelHorta Jun 4, 2024
9914400
Add: serverbuttons feature > fixme
AdminChucky Jun 5, 2024
24b93fe
fix MakeServerButtons
MiguelHorta Jun 5, 2024
56defd5
Update serverbuttons
AdminChucky Jun 6, 2024
c5416bc
Update serverbuttons
AdminChucky Jun 10, 2024
33b63db
Code has been improved (couple of warnings)
AdminChucky Jun 11, 2024
fdff0d3
Fix: close admin buttons by exit of company window
AdminChucky Jun 12, 2024
1223625
Fix: crash if config file does not present
AdminChucky Jun 14, 2024
fa57e8a
Arrange of additional windows reworked.
AdminChucky Jun 15, 2024
1df440a
Fix: admin join; update: several language strings
AdminChucky Jun 28, 2024
13466cb
Add: show login window after joining a server (request by players)
AdminChucky Jul 6, 2024
55e0c82
Change url for btpro.
AdminChucky Jul 10, 2024
8e9ce8c
Fix cargo payment graph displaying vanilla vaules despite doubled tim…
ldpl Nov 19, 2024
1dfdcc5
Rework station building tool for rail and road
ldpl Nov 16, 2024
e993c70
Implement dock building preview
ldpl Nov 19, 2024
bfbaf69
Bump the actions group with 6 updates (#36)
dependabot[bot] Nov 16, 2024
460acb4
Fix windows compilation
MiguelHorta Dec 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix windows compilation
MiguelHorta committed Dec 14, 2024
commit 460acb4b350ff8b54aa0b3cbeddd74b4b9e049ce
13 changes: 2 additions & 11 deletions src/citymania/cm_blueprint.cpp
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@

#include "cm_commands.hpp"
#include "cm_highlight.hpp"
#include "cm_station_gui.hpp"

#include "../console_func.h"
#include "../command_func.h"
@@ -24,17 +25,7 @@
extern TileHighlightData _thd;
extern RailType _cur_railtype;
extern void GetStationLayout(byte *layout, uint numtracks, uint plat_len, const StationSpec *statspec);

// from rail_gui.cpp
struct RailStationGUISettings {
Axis orientation; ///< Currently selected rail station orientation

bool newstations; ///< Are custom station definitions available?
StationClassID station_class; ///< Currently selected custom station class (if newstations is \c true )
byte station_type; ///< %Station type within the currently selected custom station class (if newstations is \c true )
byte station_count; ///< Number of custom stations (if newstations is \c true )
};
extern RailStationGUISettings _railstation; ///< Settings of the station builder GUI
extern citymania::RailStationGUISettings _railstation; ///< Settings of the station builder GUI

namespace citymania {

11 changes: 1 addition & 10 deletions src/citymania/cm_highlight.cpp
Original file line number Diff line number Diff line change
@@ -77,16 +77,7 @@ extern IndustryType _cm_funding_type;
extern void GetStationLayout(byte *layout, uint numtracks, uint plat_len, const StationSpec *statspec);
extern void IndustryDrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, byte rnd_colour, byte stage);
extern void SetSelectionTilesDirty();

struct RailStationGUISettings {
Axis orientation; ///< Currently selected rail station orientation

bool newstations; ///< Are custom station definitions available?
StationClassID station_class; ///< Currently selected custom station class (if newstations is \c true )
byte station_type; ///< %Station type within the currently selected custom station class (if newstations is \c true )
byte station_count; ///< Number of custom stations (if newstations is \c true )
};
extern RailStationGUISettings _railstation; ///< Settings of the station builder GUI
extern citymania::RailStationGUISettings _railstation; ///< Settings of the station builder GUI

struct RoadStopGUISettings {
DiagDirection orientation;
11 changes: 2 additions & 9 deletions src/citymania/cm_hotkeys.cpp
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@

#include "cm_hotkeys.hpp"
#include "cm_settings.hpp"
#include "cm_station_gui.hpp"

#include "../newgrf_station.h"
#include "../settings_type.h"
@@ -19,15 +20,7 @@

#include "../safeguards.h"

struct RailStationGUISettings {
Axis orientation; ///< Currently selected rail station orientation

bool newstations; ///< Are custom station definitions available?
StationClassID station_class; ///< Currently selected custom station class (if newstations is \c true )
byte station_type; ///< %Station type within the currently selected custom station class (if newstations is \c true )
byte station_count; ///< Number of custom stations (if newstations is \c true )
};
extern RailStationGUISettings _railstation; ///< Settings of the station builder GUI
extern citymania::RailStationGUISettings _railstation; ///< Settings of the station builder GUI

namespace citymania {

13 changes: 2 additions & 11 deletions src/citymania/cm_station_gui.cpp
Original file line number Diff line number Diff line change
@@ -51,16 +51,7 @@ extern byte _selected_airport_layout;
extern RailType _cur_railtype; // rail_gui.cpp
extern RoadType _cur_roadtype; // road_gui.cpp
extern void GetStationLayout(byte *layout, uint numtracks, uint plat_len, const StationSpec *statspec);

struct RailStationGUISettings {
Axis orientation; ///< Currently selected rail station orientation

bool newstations; ///< Are custom station definitions available?
StationClassID station_class; ///< Currently selected custom station class (if newstations is \c true )
byte station_type; ///< %Station type within the currently selected custom station class (if newstations is \c true )
byte station_count; ///< Number of custom stations (if newstations is \c true )
};
extern RailStationGUISettings _railstation; //rail_gui.cpp
extern citymania::RailStationGUISettings _railstation; ///< Settings of the station builder GUI

struct RoadStopGUISettings {
DiagDirection orientation;
@@ -945,7 +936,7 @@ up<Command> DockPreview::GetRemoveCommand() const {
}

bool DockPreview::Execute(up<Command> cmd, bool remove_mode) const {
cmd->post(&CcBuildDocks);
return cmd->post(&CcBuildDocks);
}

void DockPreview::AddPreviewTiles(Preview::TileMap &tiles, SpriteID palette) const {
11 changes: 1 addition & 10 deletions src/rail_gui.cpp
Original file line number Diff line number Diff line change
@@ -81,15 +81,6 @@ static const int HOTKEY_BLUEPRINT_LOAD_END = 0x1030;
static const int HOTKEY_BLUEPRINT_SAVE = 0x1030;
static const int HOTKEY_BLUEPRINT_SAVE_END = 0x1040;

// Moved to cm_station_gui.hpp
// struct RailStationGUISettings {
// Axis orientation; ///< Currently selected rail station orientation

// bool newstations; ///< Are custom station definitions available?
// StationClassID station_class; ///< Currently selected custom station class (if newstations is \c true )
// uint16_t station_type; ///< %Station type within the currently selected custom station class (if newstations is \c true )
// uint16_t station_count; ///< Number of custom stations (if newstations is \c true )
// };
citymania::RailStationGUISettings _railstation; ///< Settings of the station builder GUI


@@ -1041,7 +1032,7 @@ struct BuildRailToolbarWindow : Window {
Hotkey((uint16)0, "cm_blueprint_save_7", HOTKEY_BLUEPRINT_SAVE + 7),
Hotkey((uint16)0, "cm_blueprint_save_8", HOTKEY_BLUEPRINT_SAVE + 8),
Hotkey((uint16)0, "cm_blueprint_save_9", HOTKEY_BLUEPRINT_SAVE + 9),
Hotkey(CM_WKC_MOUSE_MIDDLE, "cm_blueprint_rotate", HOTKEY_BLUEPRINT_ROTATE),
Hotkey(CM_WKC_MOUSE_MIDDLE, "cm_blueprint_rotate", HOTKEY_BLUEPRINT_ROTATE),
}, RailToolbarGlobalHotkeys};
};