diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-07-16 18:40:14 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-07-16 18:40:14 +0000 |
| commit | f3149df6e497676db3c57c2d2554d4b6185a0f12 (patch) | |
| tree | fb2cc5ce4eb3a7df0b1449c77bf3f698ca87cb03 | |
| parent | c4373df7fe6798c027655b46e408b73b8476a3a3 (diff) | |
| download | zcatch-f3149df6e497676db3c57c2d2554d4b6185a0f12.tar.gz zcatch-f3149df6e497676db3c57c2d2554d4b6185a0f12.zip | |
fixed so that the data container is only loaded once
| -rw-r--r-- | src/game/client/game_client.cpp | 2 | ||||
| -rw-r--r-- | src/game/client/menu.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp index 67354bec..e3a0ab76 100644 --- a/src/game/client/game_client.cpp +++ b/src/game/client/game_client.cpp @@ -11,7 +11,7 @@ using namespace baselib; -static data_container *data; +data_container *data = 0x0; int charids[16] = {2,10,0,4,12,6,14,1,9,15,13,11,7,5,8,3}; diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp index d90e5039..dc689ab6 100644 --- a/src/game/client/menu.cpp +++ b/src/game/client/menu.cpp @@ -23,7 +23,7 @@ #include "data.h" -static data_container *data; +extern data_container *data; using namespace baselib; @@ -956,8 +956,6 @@ void modmenu_init() teewars_banner_texture = gfx_load_texture("data/gui_logo.png"); music_menu = snd_load_wav("data/audio/Music_Menu.wav"); - - data = load_data_container("data/client.dat"); } void modmenu_shutdown() |