From 56e8c7c1aba6ea47752c7fc554edd27443387c5e Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Tue, 18 Oct 2016 15:11:05 -0400 Subject: [PATCH] fix compiler errors/warnings with FS2 demo --- src/ac/ac_stubs.cpp | 2 ++ src/fonttool/fontstubs.cpp | 2 ++ src/freespace2/freespace.cpp | 2 +- src/nebedit/nebstubs.cpp | 2 ++ src/network/multi_fstracker.cpp | 10 +++++++--- src/network/ptrack.cpp | 24 ++++++++++++++++++++++-- src/pofview/pofviewstubs.cpp | 7 +++++++ src/stats/medals.cpp | 2 +- src/weapon/beam.cpp | 3 +-- 9 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/ac/ac_stubs.cpp b/src/ac/ac_stubs.cpp index 76f517c..03ce449 100644 --- a/src/ac/ac_stubs.cpp +++ b/src/ac/ac_stubs.cpp @@ -148,3 +148,5 @@ void game_tst_mark(struct object*, struct ship*){} int game_do_cd_mission_check(char*){return 0;} time_t Player_multi_died_check; int tst; +void demo_reset_trailer_timer(){} +void game_feature_not_in_demo_popup(){} diff --git a/src/fonttool/fontstubs.cpp b/src/fonttool/fontstubs.cpp index 11f6e8a..27ab416 100644 --- a/src/fonttool/fontstubs.cpp +++ b/src/fonttool/fontstubs.cpp @@ -111,3 +111,5 @@ time_t Player_multi_died_check; int tst; int game_single_step; int last_single_step; +void demo_reset_trailer_timer(){} +void game_feature_not_in_demo_popup(){} diff --git a/src/freespace2/freespace.cpp b/src/freespace2/freespace.cpp index 50cb73e..6335e3b 100644 --- a/src/freespace2/freespace.cpp +++ b/src/freespace2/freespace.cpp @@ -7675,7 +7675,7 @@ static int Demo_upsell_screen_number = 0; static int Demo_upsell_show_next_bitmap_time; //XSTR:OFF -static char *Demo_upsell_bitmap_filenames[GR_NUM_RESOLUTIONS][NUM_DEMO_UPSELL_SCREENS] = +static const char *Demo_upsell_bitmap_filenames[GR_NUM_RESOLUTIONS][NUM_DEMO_UPSELL_SCREENS] = { #ifdef FS1_DEMO { "DemoUpsell1", diff --git a/src/nebedit/nebstubs.cpp b/src/nebedit/nebstubs.cpp index ae55017..18469f1 100644 --- a/src/nebedit/nebstubs.cpp +++ b/src/nebedit/nebstubs.cpp @@ -101,3 +101,5 @@ void game_tst_mark(struct object*, struct ship*){} int tst; int game_single_step; int last_single_step; +void demo_reset_trailer_timer(){} +void game_feature_not_in_demo_popup(){} diff --git a/src/network/multi_fstracker.cpp b/src/network/multi_fstracker.cpp index ff3ef11..0c09702 100644 --- a/src/network/multi_fstracker.cpp +++ b/src/network/multi_fstracker.cpp @@ -1107,7 +1107,9 @@ void multi_stats_fs_to_tracker(scoring_struct *fs, vmt_stats_struct *vmt, player #ifndef MAKE_FS1 SDL_assert(MAX_FS2_MEDALS == NUM_MEDALS); memcpy(vmt->medals, fs->medals, sizeof(int) * MAX_FS2_MEDALS); +#ifndef FS2_DEMO vmt->num_medals = MAX_FS2_MEDALS; +#endif #else memcpy(vmt->medals, fs->medals, sizeof(int) * MAX_FS_MEDALS); #endif @@ -1116,7 +1118,9 @@ void multi_stats_fs_to_tracker(scoring_struct *fs, vmt_stats_struct *vmt, player #ifndef MAKE_FS1 SDL_assert(MAX_FS2_SHIP_TYPES == MAX_SHIP_TYPES); memcpy(vmt->kills, fs->kills, sizeof(ushort) * MAX_FS2_SHIP_TYPES); +#ifndef FS2_DEMO vmt->num_ship_types = MAX_FS2_SHIP_TYPES; +#endif #else memcpy(vmt->kills, fs->kills, sizeof(int) * MAX_FS_SHIP_TYPES); #endif @@ -1143,14 +1147,14 @@ void multi_stats_fs_to_tracker(scoring_struct *fs, vmt_stats_struct *vmt, player // copy a tracker-freespace stats struct to a freespace stats struct void multi_stats_tracker_to_fs(vmt_stats_struct *vmt,scoring_struct *fs) { -#ifndef MAKE_FS1 +#if !defined(MAKE_FS1) && !defined(FS2_DEMO) int num_medals, num_ship_types; #endif // score, rank and medals fs->score = vmt->score; fs->rank = vmt->rank; -#ifndef MAKE_FS1 +#if !defined(MAKE_FS1) && !defined(FS2_DEMO) num_medals = vmt->num_medals; if(num_medals > NUM_MEDALS){ Int3(); @@ -1164,7 +1168,7 @@ void multi_stats_tracker_to_fs(vmt_stats_struct *vmt,scoring_struct *fs) #endif // kills and assists -#ifndef MAKE_FS1 +#if !defined(MAKE_FS1) && !defined(FS2_DEMO) num_ship_types = vmt->num_ship_types; if(num_ship_types > MAX_SHIP_TYPES){ Int3(); diff --git a/src/network/ptrack.cpp b/src/network/ptrack.cpp index 55b504b..629f5aa 100644 --- a/src/network/ptrack.cpp +++ b/src/network/ptrack.cpp @@ -26,7 +26,11 @@ // check structs for size compatibility //SDL_COMPILE_TIME_ASSERT(udp_packet_header, sizeof(udp_packet_header) == 497); #ifndef MAKE_FS1 +#ifdef FS2_DEMO +SDL_COMPILE_TIME_ASSERT(vmt_freespace2_struct, sizeof(vmt_freespace2_struct) == 408); +#else SDL_COMPILE_TIME_ASSERT(vmt_freespace2_struct, sizeof(vmt_freespace2_struct) == 440); +#endif #else SDL_COMPILE_TIME_ASSERT(vmt_freespace_struct, sizeof(vmt_freespace_struct) == 468); #endif @@ -119,6 +123,14 @@ static int SerializePilotPacket(const udp_packet_header *uph, ubyte *data) for (i = 0; i < MAX_FS_SHIP_TYPES; i++) { PXO_ADD_INT(fs2->kills[i]); } +#elif defined(FS2_DEMO) + for (i = 0; i < MAX_FS2_MEDALS; i++) { + PXO_ADD_INT(fs2->medals[i]); + } + + for (i = 0; i < MAX_FS2_SHIP_TYPES; i++) { + PXO_ADD_USHORT(fs2->kills[i]); + } #endif PXO_ADD_INT(fs2->assists); @@ -145,7 +157,7 @@ static int SerializePilotPacket(const udp_packet_header *uph, ubyte *data) PXO_ADD_UINT(fs2->flight_time); PXO_ADD_UINT(fs2->last_flown); -#ifndef MAKE_FS1 +#if !defined(MAKE_FS1) && !defined(FS2_DEMO) PXO_ADD_USHORT(fs2->num_medals); PXO_ADD_USHORT(fs2->num_ship_types); @@ -275,6 +287,14 @@ static void DeserializePilotPacket(const ubyte *data, const int data_size, udp_p for (i =0; i < MAX_FS_SHIP_TYPES; i++) { PXO_GET_INT(fs2->kills[i]); } +#elif defined(FS2_DEMO) + for (i = 0; i < MAX_FS2_MEDALS; i++) { + PXO_GET_INT(fs2->medals[i]); + } + + for (i =0; i < MAX_FS2_SHIP_TYPES; i++) { + PXO_GET_USHORT(fs2->kills[i]); + } #endif PXO_GET_INT(fs2->assists); @@ -301,7 +321,7 @@ static void DeserializePilotPacket(const ubyte *data, const int data_size, udp_p PXO_GET_UINT(fs2->flight_time); PXO_GET_UINT(fs2->last_flown); -#ifndef MAKE_FS1 +#if !defined(MAKE_FS1) && !defined(FS2_DEMO) PXO_GET_USHORT(fs2->num_medals); PXO_GET_USHORT(fs2->num_ship_types); diff --git a/src/pofview/pofviewstubs.cpp b/src/pofview/pofviewstubs.cpp index e7cd746..74da4bd 100644 --- a/src/pofview/pofviewstubs.cpp +++ b/src/pofview/pofviewstubs.cpp @@ -28,6 +28,13 @@ void demo_set_playback_filter() { } +void demo_reset_trailer_timer() +{ +} + +void game_feature_not_in_demo_popup() +{ +} void os_close() { diff --git a/src/stats/medals.cpp b/src/stats/medals.cpp index 7ab1a5c..02c441f 100644 --- a/src/stats/medals.cpp +++ b/src/stats/medals.cpp @@ -476,7 +476,7 @@ void parse_medal_tbl() stuff_string(Badge_info[bi].voice_base, F_NAME, NULL, MAX_FILENAME_LEN); required_string("$Wavefile 2:"); stuff_string(Badge_info[bi].voice_base2, F_NAME, NULL, MAX_FILENAME_LEN); - #elif FS2_DEMO + #elif defined(FS2_DEMO) #warning FS2_DEMO HACK: Wavefile 1/2: wave1? wave2? required_string("$Wavefile 1:"); stuff_string(Badge_info[bi].voice_base, F_NAME, NULL, MAX_FILENAME_LEN); diff --git a/src/weapon/beam.cpp b/src/weapon/beam.cpp index 72d134a..5a111fb 100644 --- a/src/weapon/beam.cpp +++ b/src/weapon/beam.cpp @@ -1833,7 +1833,6 @@ void beam_delete(beam *b) // given an object, return its model num int beam_get_model(object *objp) { - int subtype; SDL_assert(objp->instance >= 0); if(objp->instance < 0){ return -1; @@ -1859,7 +1858,7 @@ int beam_get_model(object *objp) #if !(defined(FS2_DEMO) || defined(FS1_DEMO)) case OBJ_ASTEROID: - subtype = Asteroids[objp->instance].asteroid_subtype; + int subtype = Asteroids[objp->instance].asteroid_subtype; SDL_assert(Asteroids[objp->instance].type >= 0); if(Asteroids[objp->instance].type < 0){ return -1; -- 2.39.2