From 9e6ceb7ddf6b9aa0bad76cc5e85998bed9dceacb Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 21:52:25 +0100 Subject: [PATCH 1/8] Fix minor leak in mvlcreate.c:main() --- d2x-rebirth/utilities/mvlcreate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/d2x-rebirth/utilities/mvlcreate.c b/d2x-rebirth/utilities/mvlcreate.c index 96ec23acb..49f06e445 100644 --- a/d2x-rebirth/utilities/mvlcreate.c +++ b/d2x-rebirth/utilities/mvlcreate.c @@ -86,6 +86,7 @@ main(int argc, char *argv[]) } else { fread(buf, len[i], 1, readfile); fwrite(buf, len[i], 1, mvlfile); + free(buf); } fclose(readfile); } From 35ada6e8d9a3d8cb409afdbd3ac816fd3f0140ff Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 21:56:05 +0100 Subject: [PATCH 2/8] Fix copy&paste error in UI debugging info --- similar/editor/info.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/editor/info.cpp b/similar/editor/info.cpp index 2600d290f..220ce567a 100644 --- a/similar/editor/info.cpp +++ b/similar/editor/info.cpp @@ -140,7 +140,7 @@ static void info_display_object_placement(int show_all) old_Cur_object_index = Cur_object_index; old_type = Objects[Cur_object_index].type; old_movement_type = Objects[Cur_object_index].movement_type; - old_mode = Objects[Cur_object_index].control_type; + old_control_type = Objects[Cur_object_index].control_type; old_mode = Objects[Cur_object_index].ctype.ai_info.behavior; } From a7099aa63a98206d7784fcbb9ebb84e86e425d25 Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 21:57:27 +0100 Subject: [PATCH 3/8] Fix copy&paste error in AI --- similar/main/ai.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index 59339f2de..6f7101d1d 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -4467,7 +4467,7 @@ static void state_ai_cloak_info_to_ai_cloak_info_rw(ai_cloak_info *aic, ai_cloak aic_rw->last_segment = aic->last_segment; #endif aic_rw->last_position.x = aic->last_position.x; - aic_rw->last_position.x = aic->last_position.y; + aic_rw->last_position.y = aic->last_position.y; aic_rw->last_position.z = aic->last_position.z; } From 1b54c54c58f1f1b9ffe68ba934ed7bac16ce8a38 Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 21:58:47 +0100 Subject: [PATCH 4/8] Fix uninitialized valiable when compiling DEMO_ONLY --- similar/main/menu.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp index ab71eadb4..b5f580063 100644 --- a/similar/main/menu.cpp +++ b/similar/main/menu.cpp @@ -512,11 +512,9 @@ static int main_menu_handler(newmenu *menu, d_event *event, int *menu_choice ) // Create the main menu. static void create_main_menu(newmenu_item *m, int *menu_choice, int *callers_num_options) { - int num_options; + int num_options = 0; #ifndef DEMO_ONLY - num_options = 0; - ADD_ITEM(TXT_NEW_GAME,MENU_NEW_GAME,KEY_N); ADD_ITEM(TXT_LOAD_GAME,MENU_LOAD_GAME,KEY_L); From c28a0c5dfab0752e25345df590843ba85383f94e Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 21:59:22 +0100 Subject: [PATCH 5/8] Remove unnecessary null check --- similar/main/newmenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/similar/main/newmenu.cpp b/similar/main/newmenu.cpp index 177f71d36..7fe377d0e 100644 --- a/similar/main/newmenu.cpp +++ b/similar/main/newmenu.cpp @@ -1572,8 +1572,8 @@ newmenu *newmenu_do4( const char * title, const char * subtitle, int nitems, new newmenu_create_structure(menu); // Create the basic window - if (menu) - wind = window_create(&grd_curscreen->sc_canvas, menu->x, menu->y, menu->w, menu->h, newmenu_handler, menu); + wind = window_create(&grd_curscreen->sc_canvas, menu->x, menu->y, menu->w, menu->h, newmenu_handler, menu); + if (!wind) { d_free(menu); From 455c46aff04979b93930d3d5f71b3ed743fa8190 Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 22:00:07 +0100 Subject: [PATCH 6/8] Remove redundant assignment --- similar/main/gamesave.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/main/gamesave.cpp b/similar/main/gamesave.cpp index 537709107..37da30bde 100644 --- a/similar/main/gamesave.cpp +++ b/similar/main/gamesave.cpp @@ -985,7 +985,7 @@ static int load_game_data(PHYSFS_file *LoadFile) int t; v29_trigger_read(&trig29, LoadFile); trig.flags = trig29.flags; - trig.num_links = trig29.num_links; + // skip trig29.link_num. v30_trigger does not need it trig.num_links = trig29.num_links; trig.value = trig29.value; trig.time = trig29.time; From bb38e8232f7f346ec2e99be8e7480f79df3d7480 Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 22:01:33 +0100 Subject: [PATCH 7/8] Use correct unsigned format specifier for sprintf --- similar/main/piggy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/main/piggy.cpp b/similar/main/piggy.cpp index 3a5662d08..ce95128ae 100644 --- a/similar/main/piggy.cpp +++ b/similar/main/piggy.cpp @@ -857,7 +857,7 @@ void piggy_new_pigfile(char *pigname) char tempname[20]; int SuperX; - sprintf( tempname, "%s#%d", basename, fnum ); + sprintf( tempname, "%s#%u", basename, fnum ); //SuperX = (GameBitmaps[i+fnum].bm_flags&BM_FLAG_SUPER_TRANSPARENT)?254:-1; SuperX = (GameBitmapFlags[i+fnum]&BM_FLAG_SUPER_TRANSPARENT)?254:-1; From 9529f60d5de98271e9787584c71423566e7f2220 Mon Sep 17 00:00:00 2001 From: vobject Date: Tue, 7 Jan 2014 22:04:23 +0100 Subject: [PATCH 8/8] Use correct type for diskid. The *_DISKID defines are larger than a 32bit signed integer. --- similar/main/songs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/main/songs.cpp b/similar/main/songs.cpp index 8bc932d2f..2fa95c491 100644 --- a/similar/main/songs.cpp +++ b/similar/main/songs.cpp @@ -270,7 +270,7 @@ void songs_pause_resume(void) // 0 otherwise static int songs_have_cd() { - int discid; + unsigned long discid; if (GameCfg.OrigTrackOrder) return 1;