Merge remote-tracking branch 'ryzomcore/hg/hotfix/patches-from-atys' into ryzomclassic-develop

code/ryzom/server/src/ai_service/ai_outpost.cpp

@@ -595,6 +595,7 @@ COutpostSquadManager::COutpostSquadManager(COutpost* parent, uint32 alias, std::
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);
@@ -618,6 +619,7 @@ COutpostSquadManager::COutpostSquadManager(COutpost* parent, uint32 alias, std::
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);
@@ -641,6 +643,7 @@ COutpostSquadManager::COutpostSquadManager(COutpost* parent, uint32 alias, std::
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);
@@ -675,6 +678,7 @@ COutpostSquadManager::COutpostSquadManager(COutpost* parent, uint32 alias, std::
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);

code/ryzom/server/src/ai_service/ai_spire.cpp

@@ -759,6 +759,7 @@ CSpireSquadManager::CSpireSquadManager(CSpire* parent, uint32 alias, std::string
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);
@@ -782,6 +783,7 @@ CSpireSquadManager::CSpireSquadManager(CSpire* parent, uint32 alias, std::string
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);
@@ -805,6 +807,7 @@ CSpireSquadManager::CSpireSquadManager(CSpire* parent, uint32 alias, std::string
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);
@@ -839,6 +842,7 @@ CSpireSquadManager::CSpireSquadManager(CSpire* parent, uint32 alias, std::string
 	eventAction = NULL;
 	
 	// Register event handler
+	// FIXME: 0 == CAIAliasDescriptionNode instance
 	event = new CAIEventReaction(getStateMachine(), 0, eventDescription.EventType);
 	event->processEventDescription(&eventDescription, getStateMachine());
 	getStateMachine()->eventReactions().addChild(event);

code/ryzom/server/src/ai_service/generic_logic_action.cpp

@@ -2688,7 +2688,7 @@ CAILogicActionCode::CAILogicActionCode (const std::vector<std::string> &args, 	c
 	const CAIAliasDescriptionNode *eventNode, 	CStateMachine *container)
 {
 	nldebug("loadActionCode");
-	_byteCode=CCompiler::getInstance().compileCode	(args, eventNode->fullName());
+	_byteCode=CCompiler::getInstance().compileCode	(args, eventNode ? eventNode->fullName() : "NULL");
 }
 	
 bool	CAILogicActionCode::executeAction(CStateInstance	*entity,const IAIEvent *event)

code/ryzom/server/src/ai_service/script_vm.h

@@ -368,7 +368,7 @@ CScriptStack::CStackEntry& CScriptStack::CStackEntry::operator=(std::string cons
 {
 	clean();
 	std::string* const strPt = new std::string(str);
-	_valp = *((int*)&strPt);
+	_valp = *((uintptr_t*)&strPt);
 	_type = EString;
 	return *this;
 }
@@ -376,7 +376,7 @@ inline
 CScriptStack::CStackEntry& CScriptStack::CStackEntry::operator=(IScriptContext* sc)
 {
 	clean();
-	_valp = *((int*)&sc);
+	_valp = *((uintptr_t*)&sc);
 	_type = EContext;
 	return *this;
 }

code/ryzom/server/src/ai_share/16x16_layer.cpp

@@ -88,9 +88,9 @@ I16x16Layer		*I16x16Layer::compress(I16x16Layer *layer, sint32 blank)
 
 	map<sint32, uint>	count;
 
-	for (i=0; i<256; ++i)
+	for (i=0; i<16; ++i) for (j=0;j<16;++j)
 	{
-		sint32	val = flayer->Array[0][i];
+		sint32	val = flayer->Array[i][j];
 
 		if (val == blank)
 			continue;

code/ryzom/server/src/ai_share/16x16_layer.h

@@ -141,7 +141,11 @@ public:
 	void	set(uint i, uint j, sint value)	{ nlassert(i<16 && j<16); Array[i][j] = value; }
 
 protected:
-	void	serial(NLMISC::IStream &f)	{ for (uint i=0; i<16*16; ++i)	f.serial(Array[0][i]); }
+	void	serial(NLMISC::IStream &f)	{
+		for (uint i=0; i<16; ++i)
+			for (uint j=0; j<16; ++j)
+				f.serial(Array[i][j]);
+	}
 };
 
 /**
@@ -166,8 +170,9 @@ protected:
 	void	serial(NLMISC::IStream &f)
 	{
 		f.serial(Mean);
-		for (uint i=0; i<16*16; ++i)
+		for (uint i=0; i<16; ++i)
-			f.serial(Array[0][i]);
+			for(uint j=0; j<16; ++j)
+				f.serial(Array[i][j]);
 	}
 };
 
@@ -193,8 +198,9 @@ protected:
 	void	serial(NLMISC::IStream &f)
 	{
 		f.serial(Mean);
-		for (uint i=0; i<16*2; ++i)
+		for (uint i=0; i<16; ++i)
-			f.serial(Array[0][i]);
+			for (uint j=0; j<2; ++j)
+				f.serial(Array[i][j]);
 	}
 };