X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fnmm.qc;h=e4e0dc6380d9aec56a1b05601a8f5d733fe1b9c5;hb=0fd6fa4f46e6e704eceac437d05daa326fa8cb14;hp=1e4da05075ad20c76b11587a69f4a2e5b3105782;hpb=13b3855f3bb15ac77e0cf442158b2f005f8256ec;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/minigames/minigame/nmm.qc b/qcsrc/common/minigames/minigame/nmm.qc index 1e4da05075..e4e0dc6380 100644 --- a/qcsrc/common/minigames/minigame/nmm.qc +++ b/qcsrc/common/minigames/minigame/nmm.qc @@ -79,9 +79,8 @@ string nmm_tile_build_vmill(entity tile) void nmm_spawn_tile(string id, entity minig, int distance) { // TODO global variable + list_next for simpler tile loops - entity e = spawn(); + entity e = new(minigame_nmm_tile); e.origin = minigame_tile_pos(id,7,7); - e.classname = "minigame_nmm_tile"; e.netname = id; e.owner = minig; e.team = 0; @@ -478,7 +477,7 @@ void nmm_hud_board(vector pos, vector mySize) FOREACH_MINIGAME_ENTITY(e) if ( e.classname == "minigame_player" && e.team == (active_minigame.minigame_flags & NMM_TURN_TEAM) ) - playername = GetPlayerName(e.minigame_playerslot-1); + playername = entcs_GetName(e.minigame_playerslot-1); vector win_pos = pos+eY*(mySize_y-winfs_y)/2; vector win_sz; @@ -532,7 +531,7 @@ void nmm_hud_status(vector pos, vector mySize) if ( e.team == 2 ) mypos_y += player_fontsize_y + ts_y; minigame_drawcolorcodedstring_trunc(mySize_x,mypos, - GetPlayerName(e.minigame_playerslot-1), + entcs_GetName(e.minigame_playerslot-1), player_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); } else if ( e.classname == "minigame_board_piece" )