diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fd1606ac3..d9753d70c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ D2X-Rebirth Changelog misc/hmp.c: Did not close hmp after MIDI conversion which caused some unfree memory - fixed main/gameseq.c, main/state.c, main/state.h: Introduced state_quick_item so we can safly check if there is a valid quicksave slot wihtout messing around with state_Default_item which is supposed to always show a valid slot in the first place main/titles.c: In briefings make sure Current_color cannot exceed possible array bounds +include/strutil.h, main/newdemo.c: Fixing some harmless compiler warnings caused by missing includes, missing newlines at end of file; cleaned up strutil.h 20100718 -------- diff --git a/include/strutil.h b/include/strutil.h index 3186f4c4f..0871512d2 100644 --- a/include/strutil.h +++ b/include/strutil.h @@ -1,16 +1,3 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ - #ifndef _STRUTILS_H #define _STRUTILS_H diff --git a/main/newdemo.c b/main/newdemo.c index e926f11e5..48aca40bf 100644 --- a/main/newdemo.c +++ b/main/newdemo.c @@ -23,6 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include // for memset #include +#include #if !(defined(__APPLE__) && defined(__MACH__)) #include