mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4944) Codechange: make _patches_newgame available via settings.h and remove instances of extern Patches _patches_newgame in .c files

release/0.5
rubidium 2006-05-22 09:59:09 +00:00
parent 58458812a4
commit 928fbe34f2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intro_gui.c
View File

@ -10,6 +10,7 @@
#include "player.h" #include "player.h"
#include "network.h" #include "network.h"
#include "variables.h" #include "variables.h"
#include "settings.h"
extern void SwitchMode(int new_mode); extern void SwitchMode(int new_mode);
@ -54,7 +55,6 @@ static void SelectGameWndProc(Window *w, WindowEvent *e)
{ {
/* We do +/- 6 for the map_xy because 64 is 2^6, but it is the lowest available element */ /* We do +/- 6 for the map_xy because 64 is 2^6, but it is the lowest available element */
static const StringID mapsizes[] = {STR_64, STR_128, STR_256, STR_512, STR_1024, STR_2048, INVALID_STRING_ID}; static const StringID mapsizes[] = {STR_64, STR_128, STR_256, STR_512, STR_1024, STR_2048, INVALID_STRING_ID};
extern Patches _patches_newgame;
switch (e->event) { switch (e->event) {
case WE_PAINT: case WE_PAINT:

3
settings.h
View File

@ -74,6 +74,9 @@ static inline void *ini_get_variable(const SaveLoad *sld, const void *object)
return (object == NULL) ? sld->address : (byte*)object + (ptrdiff_t)sld->address; return (object == NULL) ? sld->address : (byte*)object + (ptrdiff_t)sld->address;
} }
/** The patch values that are used for new games and/or modified in config file */
extern Patches _patches_newgame;
void IConsoleSetPatchSetting(const char *name, const char *value); void IConsoleSetPatchSetting(const char *name, const char *value);
void IConsoleGetPatchSetting(const char *name); void IConsoleGetPatchSetting(const char *name);
const SettingDesc *GetPatchFromName(const char *name, uint *i); const SettingDesc *GetPatchFromName(const char *name, uint *i);

1
settings_gui.c
View File

@ -675,7 +675,6 @@ static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
switch (e->event) { switch (e->event) {
case WE_CREATE: { case WE_CREATE: {
extern Patches _patches_newgame;
static bool first_time = true; static bool first_time = true;
patches_ptr = (_game_mode == GM_MENU) ? &_patches_newgame : &_patches; patches_ptr = (_game_mode == GM_MENU) ? &_patches_newgame : &_patches;