diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6193eb6f9..af2de59a2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ D1X-Rebirth Changelog -------- main/console.c, main/game.c, main/gamerend.c, main/gauges.c: Added timer_update() to stop/start/reset_time() functions so resumed last_timer_value will be precise; Added new FPS counter which actually does count the frames rendered per second and is less irritating; Added timer_dleay2 call to console to not stress CPU too much; Imporoved placement for show_time(), multi messages main/cntrlcen.c, main/cntrlcen.h, main/fuelcen.c, main/multi.c, main/state.c: Handling Controlcen countdown Descent2-way to make code more similar but more importantly to avoid issues in Multiplayer levels which do not even have a Controlcen type Station causing the game get stuck in an infinite loop; Fixed small issue parsing killreactor command in Multiplayer +main/polyobj.h: _POLYOBJ_H definition was not terminated at end of file causing compiling to fail with WORDS_NEED_ALIGNMENT define 20110121 -------- diff --git a/main/polyobj.h b/main/polyobj.h index 7b666bc79..c4532f8f8 100644 --- a/main/polyobj.h +++ b/main/polyobj.h @@ -96,8 +96,6 @@ extern grs_bitmap *texture_list[MAX_POLYOBJ_TEXTURES]; extern bitmap_index texture_list_index[MAX_POLYOBJ_TEXTURES]; extern g3s_point robot_points[]; -#endif - #ifdef WORDS_NEED_ALIGNMENT /* * A chunk struct (as used for alignment) contains all relevant data @@ -130,3 +128,5 @@ extern int polymodel_read_n(polymodel *pm, int n, CFILE *fp); * routine which allocates, reads, and inits a polymodel's model_data */ extern void polygon_model_data_read(polymodel *pm, CFILE *fp); + +#endif