X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qh;h=d8b84709b3739951025f801b070a8384f3d23e7b;hb=1f988ad58a9fb5cef7ed843ad839b23dd23f6dc9;hp=698bd7e40ace811727cf2588b1c62e92ee4213e9;hpb=f9c08b5c298e2604040f6af91f23a85e0e781fa4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index 698bd7e40..d8b84709b 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -1,4 +1,4 @@ -var float MAPINFO_TYPE_ALL = 0; +float MAPINFO_TYPE_ALL; entity MapInfo_Type_first; entity MapInfo_Type_last; .entity enemy; // internal next pointer @@ -42,9 +42,6 @@ REGISTER_GAMETYPE(_("Last Man Standing"),lms,g_lms,LMS,"timelimit=20 lives=9 lea REGISTER_GAMETYPE(_("Arena"),arena,g_arena,ARENA,"timelimit=20 pointlimit=10 leadlimit=0") #define g_arena IS_GAMETYPE(ARENA) -REGISTER_GAMETYPE(_("Runematch"),rune,g_runematch,RUNEMATCH,"timelimit=20 pointlimit=200 leadlimit=0") -#define g_runematch IS_GAMETYPE(RUNEMATCH) - REGISTER_GAMETYPE(_("Race"),rc,g_race,RACE,"timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0") #define g_race IS_GAMETYPE(RACE) @@ -81,13 +78,16 @@ REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_freezetag,FREEZETAG,"timelimit=20 pointli REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,"timelimit=20 pointlimit=30") #define g_keepaway IS_GAMETYPE(KEEPAWAY) -float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps -float MAPINFO_FEATURE_VEHICLES = 2; -float MAPINFO_FEATURE_TURRETS = 4; +REGISTER_GAMETYPE(_("Invasion"),invasion,g_invasion,INVASION,"pointlimit=5") +#define g_invasion IS_GAMETYPE(INVASION) + +const float MAPINFO_FEATURE_WEAPONS = 1; // not defined for minstagib-only maps +const float MAPINFO_FEATURE_VEHICLES = 2; +const float MAPINFO_FEATURE_TURRETS = 4; -float MAPINFO_FLAG_HIDDEN = 1; // not in lsmaps/menu/vcall/etc., can just be changed to manually -float MAPINFO_FLAG_FORBIDDEN = 2; // don't even allow the map by a cvar setting that allows hidden maps -float MAPINFO_FLAG_FRUSTRATING = 4; // this map is near impossible to play, enable at your own risk +const float MAPINFO_FLAG_HIDDEN = 1; // not in lsmaps/menu/vcall/etc., can just be changed to manually +const float MAPINFO_FLAG_FORBIDDEN = 2; // don't even allow the map by a cvar setting that allows hidden maps +const float MAPINFO_FLAG_FRUSTRATING = 4; // this map is near impossible to play, enable at your own risk float MapInfo_count;