Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:14:28 +0000 (15:14 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 21 May 2011 12:14:28 +0000 (15:14 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc

Simple merge
@@@ -945,9 -977,9 +977,10 @@@ void(float bIsNewEntity) CSQC_Ent_Updat
                case ENT_CLIENT_LGBEAM: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_LGBEAM); break;
                case ENT_CLIENT_GAUNTLET: Ent_ReadHook(bIsNewEntity, ENT_CLIENT_GAUNTLET); break;
                case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
 +              case ENT_CLIENT_DAMAGEEFFECT: Ent_DamageEffect(); break;
                default:
-                       error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
+                       //error(strcat(_("unknown entity type in CSQC_Ent_Update: %d\n"), self.enttype));
+                       error(sprintf(_("Unknown entity type in CSQC_Ent_Update (enttype: %d, edict: %d, classname: %s)\n"), self.enttype, num_for_edict(self), self.classname));
                        break;
        }
  
Simple merge
@@@ -114,8 -114,8 +114,9 @@@ const float ENT_CLIENT_HOOK = 27
  const float ENT_CLIENT_LGBEAM = 28;
  const float ENT_CLIENT_GAUNTLET = 29;
  const float ENT_CLIENT_ACCURACY = 30;
- const float ENT_CLIENT_WARPZONE_TELEPORTED = 31;
- const float ENT_CLIENT_DAMAGEEFFECT = 32;
+ const float ENT_CLIENT_SHOWNAMES = 31;
+ const float ENT_CLIENT_WARPZONE_TELEPORTED = 32;
++const float ENT_CLIENT_DAMAGEEFFECT = 33;
  
  const float ENT_CLIENT_TURRET = 40;
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge