aboutsummaryrefslogtreecommitdiff
path: root/mp/src/game/server/hl2/npc_citizen17.cpp
diff options
context:
space:
mode:
authorMichael Sartain <[email protected]>2014-10-02 08:25:55 -0700
committerMichael Sartain <[email protected]>2014-10-02 08:25:55 -0700
commit55ed12f8d1eb6887d348be03aee5573d44177ffb (patch)
tree3686f7ca78c780cd9a3d367b79a9d9250c1be7c0 /mp/src/game/server/hl2/npc_citizen17.cpp
parent* Added support for Visual C++ 2013 Express to VPC (diff)
downloadsource-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.tar.xz
source-sdk-2013-55ed12f8d1eb6887d348be03aee5573d44177ffb.zip
Updated the SDK with the latest code from the TF and HL2 branches.
Diffstat (limited to 'mp/src/game/server/hl2/npc_citizen17.cpp')
-rw-r--r--mp/src/game/server/hl2/npc_citizen17.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/mp/src/game/server/hl2/npc_citizen17.cpp b/mp/src/game/server/hl2/npc_citizen17.cpp
index d48cf6c2..adb9eb8c 100644
--- a/mp/src/game/server/hl2/npc_citizen17.cpp
+++ b/mp/src/game/server/hl2/npc_citizen17.cpp
@@ -143,23 +143,23 @@ struct citizen_expression_list_t
// Scared
citizen_expression_list_t ScaredExpressions[STATES_WITH_EXPRESSIONS] =
{
- { "scenes/Expressions/citizen_scared_idle_01.vcd" },
- { "scenes/Expressions/citizen_scared_alert_01.vcd" },
- { "scenes/Expressions/citizen_scared_combat_01.vcd" },
+ { { "scenes/Expressions/citizen_scared_idle_01.vcd" } },
+ { { "scenes/Expressions/citizen_scared_alert_01.vcd" } },
+ { { "scenes/Expressions/citizen_scared_combat_01.vcd" } },
};
// Normal
citizen_expression_list_t NormalExpressions[STATES_WITH_EXPRESSIONS] =
{
- { "scenes/Expressions/citizen_normal_idle_01.vcd" },
- { "scenes/Expressions/citizen_normal_alert_01.vcd" },
- { "scenes/Expressions/citizen_normal_combat_01.vcd" },
+ { { "scenes/Expressions/citizen_normal_idle_01.vcd" } },
+ { { "scenes/Expressions/citizen_normal_alert_01.vcd" } },
+ { { "scenes/Expressions/citizen_normal_combat_01.vcd" } },
};
// Angry
citizen_expression_list_t AngryExpressions[STATES_WITH_EXPRESSIONS] =
{
- { "scenes/Expressions/citizen_angry_idle_01.vcd" },
- { "scenes/Expressions/citizen_angry_alert_01.vcd" },
- { "scenes/Expressions/citizen_angry_combat_01.vcd" },
+ { { "scenes/Expressions/citizen_angry_idle_01.vcd" } },
+ { { "scenes/Expressions/citizen_angry_alert_01.vcd" } },
+ { { "scenes/Expressions/citizen_angry_combat_01.vcd" } },
};
//-----------------------------------------------------------------------------
@@ -4197,8 +4197,6 @@ void CNPC_Citizen::AddInsignia()
void CNPC_Citizen::RemoveInsignia()
{
- // This is crap right now.
- CBaseEntity *FirstEnt();
CBaseEntity *pEntity = gEntList.FirstEnt();
while( pEntity )