r2978 - in trunk/data/qcsrc: common menu-div0test menu-div0test/item menu-div0test/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Nov 17 05:48:26 EST 2007
Author: div0
Date: 2007-11-17 05:48:26 -0500 (Sat, 17 Nov 2007)
New Revision: 2978
Modified:
trunk/data/qcsrc/common/mapinfo.qc
trunk/data/qcsrc/menu-div0test/item/modalcontroller.c
trunk/data/qcsrc/menu-div0test/menu.qc
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c
trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
Log:
fix divisions by zero
Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc 2007-11-17 10:28:18 UTC (rev 2977)
+++ trunk/data/qcsrc/common/mapinfo.qc 2007-11-17 10:48:26 UTC (rev 2978)
@@ -110,7 +110,7 @@
}
_MapInfo_filtered = strzone(_MapInfo_filtered);
MapInfo_count = HugeSetOfIntegers_length(_MapInfo_filtered);
- print("Filter ", ftos(pGametype), "/", ftos(pFeatures), " has ", ftos(MapInfo_count), "\n");
+ //print("Filter ", ftos(pGametype), "/", ftos(pFeatures), " has ", ftos(MapInfo_count), "\n");
// TODO clear cache
return 1;
}
@@ -242,7 +242,6 @@
else
{
MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_DEATHMATCH; // DM always works
- MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_RUNEMATCH; // Rune always works
MapInfo_Map_supportedGametypes |= MAPINFO_TYPE_LMS; // LMS always works
if(MapInfo_Map_spawnpoints >= 8 && MapInfo_Map_diameter > 4096)
@@ -450,7 +449,6 @@
req = 0;
if(!(cvar("g_instagib") || cvar("g_minstagib") || cvar("g_nixnex") || cvar("g_rocketarena")))
req |= MAPINFO_FEATURE_WEAPONS;
- print(ftos(req), "\n");
return req;
}
Modified: trunk/data/qcsrc/menu-div0test/item/modalcontroller.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/modalcontroller.c 2007-11-17 10:28:18 UTC (rev 2977)
+++ trunk/data/qcsrc/menu-div0test/item/modalcontroller.c 2007-11-17 10:48:26 UTC (rev 2978)
@@ -250,8 +250,11 @@
if(other.ModalController_state == 0 || skipAnimation)
{
me.setFocus(me, NULL);
- other.ModalController_buttonOrigin = globalToBox(theOrigin, me.origin, me.size);
- other.ModalController_buttonSize = globalToBoxSize(theSize, me.size);
+ if(!skipAnimation)
+ {
+ other.ModalController_buttonOrigin = globalToBox(theOrigin, me.origin, me.size);
+ other.ModalController_buttonSize = globalToBoxSize(theSize, me.size);
+ }
me.switchState(me, other, 1, skipAnimation);
} // zoom in from button (factor increases)
}
Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc 2007-11-17 10:28:18 UTC (rev 2977)
+++ trunk/data/qcsrc/menu-div0test/menu.qc 2007-11-17 10:48:26 UTC (rev 2978)
@@ -159,19 +159,22 @@
draw_reset();
draw_alpha *= menuAlpha;
- vector dMouse;
- dMouse = getmousepos();
- dMouse *= frametime / realFrametime; // for capturevideo
- if(dMouse != '0 0 0')
+ if(frametime > 0)
{
- dMouse = globalToBoxSize(dMouse, draw_scale);
- menuMousePos += dMouse * 1; // TODO use a cvar here
- menuMousePos_x = bound(0, menuMousePos_x, 1);
- menuMousePos_y = bound(0, menuMousePos_y, 1);
- if(mouseButtonsPressed)
- main.mouseDrag(main, menuMousePos);
- else
- main.mouseMove(main, menuMousePos);
+ vector dMouse;
+ dMouse = getmousepos();
+ dMouse *= frametime / realFrametime; // for capturevideo
+ if(dMouse != '0 0 0')
+ {
+ dMouse = globalToBoxSize(dMouse, draw_scale);
+ menuMousePos += dMouse * 1; // TODO use a cvar here
+ menuMousePos_x = bound(0, menuMousePos_x, 1);
+ menuMousePos_y = bound(0, menuMousePos_y, 1);
+ if(mouseButtonsPressed)
+ main.mouseDrag(main, menuMousePos);
+ else
+ main.mouseMove(main, menuMousePos);
+ }
}
main.draw(main);
draw_drawMousePointer(menuMousePos);
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c 2007-11-17 10:28:18 UTC (rev 2977)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c 2007-11-17 10:48:26 UTC (rev 2978)
@@ -30,8 +30,8 @@
float n;
me.TR(me);
- n = 7 + 2 * !!cvar("developer");
- me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_dm", "Deathmatch"));
+ n = 8 + 2 * !!cvar("developer");
+ me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_dm", "DM"));
e0 = e;
me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_tdm", "TDM"));
if(e.checked) e0 = NULL;
@@ -41,6 +41,8 @@
if(e.checked) e0 = NULL;
me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_runematch", "Rune"));
if(e.checked) e0 = NULL;
+ me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_domination", "Dom"));
+ if(e.checked) e0 = NULL;
me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_keyhunt", "Key Hunt"));
if(e.checked) e0 = NULL;
me.TD(me, 2, me.columns / n, e = makeNexuizGametypeButton(1, "g_ctf", "CTF"));
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c 2007-11-17 10:28:18 UTC (rev 2977)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create_mapinfo.c 2007-11-17 10:48:26 UTC (rev 2978)
@@ -19,6 +19,7 @@
ATTRIB(NexuizMapInfoDialog, typeLMSLabel, entity, NULL)
ATTRIB(NexuizMapInfoDialog, typeArenaLabel, entity, NULL)
ATTRIB(NexuizMapInfoDialog, typeRuneLabel, entity, NULL)
+ ATTRIB(NexuizMapInfoDialog, typeDominationLabel, entity, NULL)
ATTRIB(NexuizMapInfoDialog, typeKeyHuntLabel, entity, NULL)
ATTRIB(NexuizMapInfoDialog, typeCTFLabel, entity, NULL)
ATTRIB(NexuizMapInfoDialog, typeAssaultLabel, entity, NULL)
@@ -102,30 +103,29 @@
me.TR(me);
me.TD(me, 1, 5.5, e = makeNexuizTextLabel(0, "Game types:"));
me.TR(me);
- me.TDempty(me, 1);
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Deathmatch"));
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Deathmatch"));
me.typeDeathmatchLabel = e;
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "TDM"));
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "TDM"));
me.typeTDMLabel = e;
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "LMS"));
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "LMS"));
me.typeLMSLabel = e;
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Arena"));
+ me.typeArenaLabel = e;
me.TR(me);
- me.TDempty(me, 1);
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Arena"));
- me.typeArenaLabel = e;
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Rune"));
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Rune"));
me.typeRuneLabel = e;
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Key Hunt"));
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Domination"));
+ me.typeDominationLabel = e;
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Key Hunt"));
me.typeKeyHuntLabel = e;
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "CTF"));
+ me.typeCTFLabel = e;
me.TR(me);
- me.TDempty(me, 1);
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "CTF"));
- me.typeCTFLabel = e;
if(cvar("developer"))
{
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Assault"));
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Assault"));
me.typeAssaultLabel = e;
- me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Onslaught"));
+ me.TD(me, 1, 5.5/4, e = makeNexuizTextLabel(0, "Onslaught"));
me.typeOnslaughtLabel = e;
}
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c 2007-11-17 10:28:18 UTC (rev 2977)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c 2007-11-17 10:48:26 UTC (rev 2978)
@@ -292,8 +292,11 @@
float f;
f = me.currentSortField;
- me.currentSortField = -1;
- me.setSortOrder(me, f, me.currentSortOrder); // force resetting the sort order
+ if(f >= 0)
+ {
+ me.currentSortField = -1;
+ me.setSortOrder(me, f, me.currentSortOrder); // force resetting the sort order
+ }
}
void ServerList_Connect_Click(entity btn, entity me)
{
More information about the nexuiz-commits
mailing list