mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-19 21:53:51 +00:00
Merge branch 'master' into collision
Conflicts: apps/openmw/mwclass/npc.cpp
This commit is contained in:
commit
7653caea27
1 changed files with 8 additions and 1 deletions
|
@ -46,7 +46,14 @@ namespace MWClass
|
|||
|
||||
std::string hairID = ref->base->hair;
|
||||
std::string headID = ref->base->head;
|
||||
std::string npcName = ref->base->name;
|
||||
|
||||
// very ugly workaround to stop OGRE from chocking on non-unique scene node handles
|
||||
static int uniqueId = 0;
|
||||
|
||||
std::ostringstream stream;
|
||||
stream << "npc$" << uniqueId++;
|
||||
|
||||
std::string npcName = stream.str(); // ref->base->name;
|
||||
//std::cout << "NPC: " << npcName << "\n";
|
||||
|
||||
//get the part of the bodypart id which describes the race and the gender
|
||||
|
|
Loading…
Reference in a new issue