mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

organisation: move peep and staff to sub directory of its own

This commit is contained in:
IntelOrca 2014-10-06 19:41:43 +01:00
parent dd6247f6ee
commit daf231a2e9
26 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -26,12 +26,12 @@ project(${PROJECT})
add_definitions(-DORCT2_RESOURCE_DIR="${ORCT2_RESOURCE_DIR}")
add_definitions(-DHAVE_CONFIG_H)
# include lodepng header
include_directories("lodepng/")
# include lib
include_directories("lib/")
# include speex header
include_directories("libspeex/")
include_directories("lib/libspeex/")
# add source files
file(GLOB_RECURSE ORCT2_SOURCES "src/*.c" "src/*.cpp" "libspeex/*.c" "lodepng/*.c")
file(GLOB_RECURSE ORCT2_SOURCES "src/*.c" "src/*.cpp" "lib/*.c")
if (UNIX)
# force 32bit build for now and set necessary flags to compile code as is

8
projects/openrct2.vcxproj
View File

@ -59,6 +59,8 @@
<ClCompile Include="..\src\management\news_item.c" />
<ClCompile Include="..\src\object.c" />
<ClCompile Include="..\src\object_list.c" />
<ClCompile Include="..\src\peep\peep.c" />
<ClCompile Include="..\src\peep\staff.c" />
<ClCompile Include="..\src\platform\shared.c" />
<ClCompile Include="..\src\platform\unix.c" />
<ClCompile Include="..\src\platform\osinterface.c" />
@ -117,9 +119,7 @@
<ClCompile Include="..\src\world\climate.c" />
<ClCompile Include="..\src\world\map.c" />
<ClCompile Include="..\src\world\park.c" />
<ClCompile Include="..\src\world\peep.c" />
<ClCompile Include="..\src\world\sprite.c" />
<ClCompile Include="..\src\world\staff.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\lib\libspeex\arch.h" />
@ -157,6 +157,8 @@
<ClInclude Include="..\src\management\marketing.h" />
<ClInclude Include="..\src\management\news_item.h" />
<ClInclude Include="..\src\object.h" />
<ClInclude Include="..\src\peep\peep.h" />
<ClInclude Include="..\src\peep\staff.h" />
<ClInclude Include="..\src\platform\osinterface.h" />
<ClInclude Include="..\src\platform\platform.h" />
<ClInclude Include="..\src\rct2.h" />
@ -178,10 +180,8 @@
<ClInclude Include="..\src\world\climate.h" />
<ClInclude Include="..\src\world\map.h" />
<ClInclude Include="..\src\world\park.h" />
<ClInclude Include="..\src\world\peep.h" />
<ClInclude Include="..\src\world\scenery.h" />
<ClInclude Include="..\src\world\sprite.h" />
<ClInclude Include="..\src\world\staff.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D24D94F6-2A74-480C-B512-629C306CE92F}</ProjectGuid>

27
projects/openrct2.vcxproj.filters
View File

@ -56,6 +56,9 @@
<Filter Include="Libraries\libspeex\speex">
<UniqueIdentifier>{209155b8-2f61-4e25-ab86-c8aa36357abd}</UniqueIdentifier>
</Filter>
<Filter Include="Source\Peep">
<UniqueIdentifier>{51e38783-5334-464c-8f90-61d725dc8013}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\openrct2.exe">
@ -131,15 +134,9 @@
<ClCompile Include="..\src\world\park.c">
<Filter>Source\World</Filter>
</ClCompile>
<ClCompile Include="..\src\world\peep.c">
<Filter>Source\World</Filter>
</ClCompile>
<ClCompile Include="..\src\world\sprite.c">
<Filter>Source\World</Filter>
</ClCompile>
<ClCompile Include="..\src\world\staff.c">
<Filter>Source\World</Filter>
</ClCompile>
<ClCompile Include="..\src\windows\about.c">
<Filter>Source\Windows</Filter>
</ClCompile>
@ -365,6 +362,12 @@
<ClCompile Include="..\lib\libspeex\resample.c">
<Filter>Libraries\libspeex</Filter>
</ClCompile>
<ClCompile Include="..\src\peep\peep.c">
<Filter>Source\Peep</Filter>
</ClCompile>
<ClCompile Include="..\src\peep\staff.c">
<Filter>Source\Peep</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\management\award.h">
@ -409,18 +412,12 @@
<ClInclude Include="..\src\world\park.h">
<Filter>Source\World</Filter>
</ClInclude>
<ClInclude Include="..\src\world\peep.h">
<Filter>Source\World</Filter>
</ClInclude>
<ClInclude Include="..\src\world\scenery.h">
<Filter>Source\World</Filter>
</ClInclude>
<ClInclude Include="..\src\world\sprite.h">
<Filter>Source\World</Filter>
</ClInclude>
<ClInclude Include="..\src\world\staff.h">
<Filter>Source\World</Filter>
</ClInclude>
<ClInclude Include="..\src\windows\dropdown.h">
<Filter>Source\Windows</Filter>
</ClInclude>
@ -547,5 +544,11 @@
<ClInclude Include="..\lib\libspeex\speex\speex_types.h">
<Filter>Libraries\libspeex\speex</Filter>
</ClInclude>
<ClInclude Include="..\src\peep\peep.h">
<Filter>Source\Peep</Filter>
</ClInclude>
<ClInclude Include="..\src\peep\staff.h">
<Filter>Source\Peep</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
src/editor.c
View File

@ -30,11 +30,11 @@
#include "management/finance.h"
#include "management/news_item.h"
#include "object.h"
#include "peep/staff.h"
#include "ride/ride.h"
#include "world/map.h"
#include "world/park.h"
#include "world/sprite.h"
#include "world/staff.h"
static void set_all_land_owned();

4
src/game.c
View File

@ -31,6 +31,8 @@
#include "management/finance.h"
#include "management/news_item.h"
#include "object.h"
#include "peep/peep.h"
#include "peep/staff.h"
#include "platform/osinterface.h"
#include "ride/ride.h"
#include "ride/vehicle.h"
@ -42,9 +44,7 @@
#include "windows/tooltip.h"
#include "world/climate.h"
#include "world/park.h"
#include "world/peep.h"
#include "world/sprite.h"
#include "world/staff.h"
int gGameSpeed = 1;

2
src/interface/window.h
View File

@ -23,9 +23,9 @@
#include "../common.h"
#include "../drawing/drawing.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../world/park.h"
#include "../world/peep.h"
struct rct_window;
union rct_window_event;

2
src/management/award.c
View File

@ -21,9 +21,9 @@
#include "../addresses.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../scenario.h"
#include "../world/peep.h"
#include "../world/sprite.h"
#include "award.h"
#include "news_item.h"

2
src/management/finance.c
View File

@ -20,9 +20,9 @@
#include "../addresses.h"
#include "../interface/window.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../world/park.h"
#include "../world/peep.h"
#include "../world/sprite.h"
#include "finance.h"

2
src/management/marketing.h
View File

@ -22,7 +22,7 @@
#define _MARKETING_H_
#include "../common.h"
#include "../world/peep.h"
#include "../peep/peep.h"
enum {
ADVERTISING_CAMPAIGN_PARK_ENTRY_FREE,

2
src/world/peep.c → src/peep/peep.c
View File

@ -26,8 +26,8 @@
#include "../management/news_item.h"
#include "../ride/ride.h"
#include "../sprites.h"
#include "../world/sprite.h"
#include "peep.h"
#include "sprite.h"
#include "staff.h"
static void peep_update(rct_peep *peep);

0
src/world/peep.h → src/peep/peep.h
View File

2
src/world/staff.c → src/peep/staff.c
View File

@ -23,8 +23,8 @@
#include "../interface/viewport.h"
#include "../localisation/string_ids.h"
#include "../management/finance.h"
#include "../world/sprite.h"
#include "peep.h"
#include "sprite.h"
#include "staff.h"
/**

0
src/world/staff.h → src/peep/staff.h
View File

4
src/ride/ride.c
View File

@ -24,11 +24,11 @@
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../management/news_item.h"
#include "../peep/peep.h"
#include "../peep/staff.h"
#include "../scenario.h"
#include "../world/map.h"
#include "../world/peep.h"
#include "../world/sprite.h"
#include "../world/staff.h"
#include "ride.h"
#include "ride_data.h"

2
src/ride/ride.h
View File

@ -22,8 +22,8 @@
#define _RIDE_H_
#include "../common.h"
#include "../peep/peep.h"
#include "../world/map.h"
#include "../world/peep.h"
typedef fixed16_2dp ride_rating;

2
src/windows/cheats.c
View File

@ -26,12 +26,12 @@
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../scenario.h"
#include "../sprites.h"
#include "../world/climate.h"
#include "../world/park.h"
#include "../world/peep.h"
#include "../world/sprite.h"
//#define WW 200

2
src/windows/game_bottom_toolbar.c
View File

@ -26,10 +26,10 @@
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../management/news_item.h"
#include "../peep/peep.h"
#include "../sprites.h"
#include "../world/climate.h"
#include "../world/park.h"
#include "../world/peep.h"
#include "../world/sprite.h"
enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX {

10
src/windows/guest_list.c
View File

@ -22,13 +22,13 @@
#include <assert.h>
#include "../addresses.h"
#include "../game.h"
#include "../world/peep.h"
#include "../localisation/localisation.h"
#include "../world/sprite.h"
#include "../sprites.h"
#include "../ride/ride.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../sprites.h"
#include "../world/sprite.h"
#include "dropdown.h"
enum {

2
src/windows/park.c
View File

@ -29,12 +29,12 @@
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../management/award.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../scenario.h"
#include "../sprites.h"
#include "../util/util.h"
#include "../world/park.h"
#include "../world/peep.h"
#include "../world/sprite.h"
#include "dropdown.h"

4
src/windows/peep.c
View File

@ -22,11 +22,11 @@
#include "../game.h"
#include "../world/map.h"
#include "../management/marketing.h"
#include "../peep/peep.h"
#include "../peep/staff.h"
#include "../ride/ride.h"
#include "../world/peep.h"
#include "../scenario.h"
#include "../localisation/localisation.h"
#include "../world/staff.h"
#include "../world/sprite.h"
#include "../sprites.h"
#include "../interface/viewport.h"

14
src/windows/ride.c
View File

@ -21,16 +21,16 @@
#include <string.h>
#include "../addresses.h"
#include "../game.h"
#include "../world/map.h"
#include "../ride/ride.h"
#include "../ride/ride_data.h"
#include "../world/staff.h"
#include "../localisation/localisation.h"
#include "../world/sprite.h"
#include "../sprites.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/staff.h"
#include "../ride/ride.h"
#include "../ride/ride_data.h"
#include "../sprites.h"
#include "../world/map.h"
#include "../world/sprite.h"
#include "dropdown.h"
#define var_496(w) RCT2_GLOBAL((int)w + 0x496, uint16)

12
src/windows/scenery.c
View File

@ -22,16 +22,16 @@
#include <stdbool.h>
#include "../addresses.h"
#include "../audio/audio.h"
#include "../game.h"
#include "../world/map.h"
#include "../drawing/drawing.h"
#include "../world/peep.h"
#include "../world/sprite.h"
#include "../world/scenery.h"
#include "../localisation/localisation.h"
#include "../game.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"
#include "../world/map.h"
#include "../world/scenery.h"
#include "../world/sprite.h"
#include "dropdown.h"
#include "scenery.h"

8
src/windows/staff.c
View File

@ -22,13 +22,13 @@
#include "../addresses.h"
#include "../game.h"
#include "../drawing/drawing.h"
#include "../world/peep.h"
#include "../world/staff.h"
#include "../world/sprite.h"
#include "../localisation/localisation.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"
#include "../peep/staff.h"
#include "../world/sprite.h"
#include "dropdown.h"
enum {

10
src/windows/staff_peep.c
View File

@ -20,15 +20,15 @@
#include "../addresses.h"
#include "../game.h"
#include "../world/peep.h"
#include "../localisation/localisation.h"
#include "../world/sprite.h"
#include "../sprites.h"
#include "../interface/viewport.h"
#include "../interface/widget.h"
#include "../interface/window.h"
#include "../localisation/localisation.h"
#include "../peep/peep.h"
#include "../peep/staff.h"
#include "../sprites.h"
#include "../world/sprite.h"
#include "dropdown.h"
#include "../world/staff.h"
enum WINDOW_STAFF_PEEP_PAGE {
WINDOW_STAFF_PEEP_OVERVIEW,

2
src/world/park.c
View File

@ -26,11 +26,11 @@
#include "../management/finance.h"
#include "../management/marketing.h"
#include "../management/news_item.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../scenario.h"
#include "../world/map.h"
#include "park.h"
#include "peep.h"
#include "sprite.h"
/**

2
src/world/sprite.h
View File

@ -22,8 +22,8 @@
#define _SPRITE_H_
#include "../common.h"
#include "../peep/peep.h"
#include "../ride/vehicle.h"
#include "peep.h"
#define SPRITE_INDEX_NULL 0xFFFF
#define SPRITE_LOCATION_NULL 0x8000