From: terencehill <piuntn@gmail.com>
Date: Sat, 26 May 2012 12:50:02 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/itemstime
X-Git-Tag: xonotic-v0.8.1~12^2~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41e9b002169cd742d5eadd4c540f55164af7f120;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/itemstime

Conflicts:
	qcsrc/client/hud.qc
	qcsrc/menu/xonotic/mainwindow.c
	qcsrc/server/t_items.qc
---

41e9b002169cd742d5eadd4c540f55164af7f120
diff --cc qcsrc/client/hud.qc
index 3e96d9223,27e0a0dc1..f7ca1a5b9
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -5002,13 -4965,11 +5144,13 @@@ switch (id) {
  	case (HUD_PANEL_ENGINEINFO):\
  		HUD_EngineInfo(); break;\
  	case (HUD_PANEL_INFOMESSAGES):\
- 		 HUD_InfoMessages(); break;\
+ 		HUD_InfoMessages(); break;\
  	case (HUD_PANEL_PHYSICS):\
- 		 HUD_Physics(); break;\
+ 		HUD_Physics(); break;\
  	case (HUD_PANEL_CENTERPRINT):\
- 		 HUD_CenterPrint(); break;\
+ 		HUD_CenterPrint(); break;\
 +	case (HUD_PANEL_ITEMSTIME):\
- 		 HUD_ItemsTime(); break;\
++		HUD_ItemsTime(); break;\
  } ENDS_WITH_CURLY_BRACE
  
  void HUD_Main (void)
diff --cc qcsrc/common/constants.qh
index 1dbafdddf,d0149251f..74c45a7a8
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -561,10 -553,7 +565,8 @@@ string HUD_PANELNAME_ENGINEINFO	 	= "en
  string HUD_PANELNAME_INFOMESSAGES	= "infomessages";
  string HUD_PANELNAME_PHYSICS	= "physics";
  string HUD_PANELNAME_CENTERPRINT	= "centerprint";
 +string HUD_PANELNAME_ITEMSTIME		= "itemstime";
  
- float HUD_MENU_ENABLE		= 0;
- 
  #define SERVERFLAG_ALLOW_FULLBRIGHT 1
  #define SERVERFLAG_TEAMPLAY 2
  #define SERVERFLAG_PLAYERSTATS 4
diff --cc qcsrc/menu/xonotic/mainwindow.c
index 3b433fa5a,f9d86c2dd..54ed66ada
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -125,11 -124,35 +124,39 @@@ void MainWindow_configureMainWindow(ent
  	i = spawnXonoticHUDCenterprintDialog();
  	i.configureDialog(i);
  	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 +
 +	i = spawnXonoticHUDItemsTimeDialog();
 +	i.configureDialog(i);
 +	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
- 
+ 	
+ 	
+ 	// dialogs used by settings
+ 	me.userbindEditDialog = i = spawnXonoticUserbindEditDialog();
+ 	i.configureDialog(i);
+ 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ 	
+ 	me.cvarsDialog = i = spawnXonoticCvarsDialog();
+ 	i.configureDialog(i);
+ 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ 	
+ 	
+ 	// dialog used by singleplayer
+ 	me.winnerDialog = i = spawnXonoticWinnerDialog();
+ 	i.configureDialog(i);
+ 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ 	
+ 	
+ 	// dialog used by multiplayer/join
+ 	me.serverInfoDialog = i = spawnXonoticServerInfoDialog();
+ 	i.configureDialog(i);
+ 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ 	
+ 	
+ 	// dialogs used by multiplayer/create
+ 	me.mapInfoDialog = i = spawnXonoticMapInfoDialog();
+ 	i.configureDialog(i);
+ 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ 	
  	me.advancedDialog = i = spawnXonoticAdvancedDialog();
  	i.configureDialog(i);
  	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
diff --cc qcsrc/server/t_items.qc
index b688831fa,ac029e657..3d7638c00
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -400,7 -265,7 +409,7 @@@ void Item_RespawnCountdown (void
  
  void Item_ScheduleRespawnIn(entity e, float t)
  {
- 	if(e.flags & FL_POWERUP || e.classname == "item_armor_large" || e.items == IT_HEALTH)
 -	if((e.flags & FL_POWERUP) || WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS))
++	if((e.flags & FL_POWERUP) || WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS) || e.classname == "item_armor_large" || e.items == IT_HEALTH)
  	{
  		e.think = Item_RespawnCountdown;
  		e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS);