From d13e72ab9d5e740783b5c8c2680d3e67c224f479 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Tue, 23 Apr 2013 02:26:47 +1000 Subject: [PATCH] avoid defining the game import var twice --- code/ui/gameinfo.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/ui/gameinfo.cpp b/code/ui/gameinfo.cpp index f523439..f08bf10 100644 --- a/code/ui/gameinfo.cpp +++ b/code/ui/gameinfo.cpp @@ -12,7 +12,7 @@ #include "../game/weapons.h" -gameinfo_import_t gi; +extern gameinfo_import_t gi; weaponData_t weaponData[WP_NUM_WEAPONS]; ammoData_t ammoData[AMMO_MAX]; @@ -29,7 +29,9 @@ GI_Init =============== */ void GI_Init( gameinfo_import_t *import ) { +#if 0 gi = *import; +#endif WP_LoadWeaponParms (); }