Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
54 changes: 27 additions & 27 deletions src/source/w_MapHeaders.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,60 @@ T& TheWorld(int type)
return dynamic_cast<T&>(TheMapProcess().GetMap(type));
}

#include "GMAida.h"
#include "GMBattleCastle.h"
#include "GMCryingWolf2nd.h"
#include "GMCrywolf1st.h"
#include "GMDoppelGanger1.h"
#include "GMDoppelGanger2.h"
#include "GMDoppelGanger3.h"
#include "GMDoppelGanger4.h"
#include "GameMaps/GMAida.h"
#include "GameMaps/GMBattleCastle.h"
#include "GameMaps/GMCryingWolf2nd.h"
#include "GameMaps/GMCrywolf1st.h"
#include "GameMaps/GMDoppelGanger1.h"
#include "GameMaps/GMDoppelGanger2.h"
#include "GameMaps/GMDoppelGanger3.h"
#include "GameMaps/GMDoppelGanger4.h"

#define g_DoppelGanger1 TheWorld<CGMDoppelGanger1>(WD_65DOPPLEGANGER1)
#define g_DoppelGanger2 TheWorld<CGMDoppelGanger2>(WD_66DOPPLEGANGER2)
#define g_DoppelGanger3 TheWorld<CGMDoppelGanger3>(WD_67DOPPLEGANGER3)
#define g_DoppelGanger4 TheWorld<CGMDoppelGanger4>(WD_68DOPPLEGANGER4)

#include "GMDuelArena.h"
#include "GameMaps/GMDuelArena.h"

#define g_DuelArena TheWorld<CGMDuelArena>(WD_64DUELARENA)

#include "GMEmpireGuardian1.h"
#include "GMEmpireGuardian2.h"
#include "GMEmpireGuardian3.h"
#include "GMEmpireGuardian4.h"
#include "GameMaps/GMEmpireGuardian1.h"
#include "GameMaps/GMEmpireGuardian2.h"
#include "GameMaps/GMEmpireGuardian3.h"
#include "GameMaps/GMEmpireGuardian4.h"

#define g_EmpireGuardian1 TheWorld<GMEmpireGuardian1>(WD_69EMPIREGUARDIAN1)
#define g_EmpireGuardian2 TheWorld<GMEmpireGuardian2>(WD_70EMPIREGUARDIAN2)
#define g_EmpireGuardian3 TheWorld<GMEmpireGuardian3>(WD_71EMPIREGUARDIAN3)
#define g_EmpireGuardian4 TheWorld<GMEmpireGuardian4>(WD_72EMPIREGUARDIAN4)

#include "GMGmArea.h"
#include "GMHellas.h"
#include "GMHuntingGround.h"
#include "GameMaps/GMGmArea.h"
#include "GameMaps/GMHellas.h"
#include "GameMaps/GMHuntingGround.h"

#ifdef ASG_ADD_MAP_KARUTAN
#include "GMKarutan1.h"
#include "GameMaps/GMKarutan1.h"
#define g_Karutan1 TheWorld<CGMKarutan1>(WD_80KARUTAN1)
#endif // ASG_ADD_MAP_KARUTAN

#include "GMNewTown.h"
#include "GameMaps/GMNewTown.h"

#include "GM_PK_Field.h"
#include "GameMaps/GM_PK_Field.h"
#define g_PKField TheWorld<CGM_PK_Field>(WD_63PK_FIELD)

#include "GM_Raklion.h"
#include "GameMaps/GM_Raklion.h"
#define g_Raklion TheWorld<SEASON4A::CGM_Raklion>(WD_57ICECITY)

#include "GMSantaTown.h"
#include "GameMaps/GMSantaTown.h"
#define g_SantaTown TheWorld<CGMSantaTown>(WD_62SANTA_TOWN)

#include "GMSwampOfQuiet.h"
#include "GameMaps/GMSwampOfQuiet.h"

#include "GMUnitedMarketPlace.h"
#include "GameMaps/GMUnitedMarketPlace.h"
#define g_UnitedMarketPlace TheWorld<GMUnitedMarketPlace>(WD_79UNITEDMARKETPLACE)

#include "GM_Kanturu_1st.h"
#include "GM_Kanturu_2nd.h"
#include "GM_Kanturu_3rd.h"
#include "GM3rdChangeUp.h"
#include "GameMaps/GM_Kanturu_1st.h"
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

There is a case inconsistency between the header file GM_Kanturu_1st.h (uppercase 'K') and its implementation file GM_kanturu_1st.cpp (lowercase 'k'). While this may work on case-insensitive filesystems (like Windows), it can lead to build failures on case-sensitive systems (like Linux). Since these files are being moved as part of this PR, it is a good opportunity to rename GM_kanturu_1st.cpp to GM_Kanturu_1st.cpp to ensure consistency with the header and other related files (e.g., GM_Kanturu_2nd.cpp).

#include "GameMaps/GM_Kanturu_2nd.h"
#include "GameMaps/GM_Kanturu_3rd.h"
#include "GameMaps/GM3rdChangeUp.h"
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The file w_MapHeaders.h is missing a newline character at the end. According to the C++ standard (e.g., C++11 §2.2/2), a non-empty source file should end with a newline. This is a best practice that prevents potential compilation warnings and issues with certain build tools or when concatenating files. Since you are already modifying this line, it's a good opportunity to add the missing newline.

Suggested change
#include "GameMaps/GM3rdChangeUp.h"
#include "GameMaps/GM3rdChangeUp.h"

Loading