Commit 3a311019 authored by Gerstrong's avatar Gerstrong

More Elder messages which are read and preparing to make a release

parent 0c940e22
......@@ -14,6 +14,7 @@
#include "CBehaviorEngine.h"
#include "ActionFormat.h"
#include "CVec.h"
#include "direction.h"
// structures for each AI module's data
#include "engine/vorticon/ai/enemydata.h"
......@@ -50,14 +51,6 @@ struct ObjMove : public CEvent
// for it's index.
#define PSUPPORTEDBYOBJECT 0
enum direction_t{
NONE,
RIGHT,
LEFT,
UP,
DOWN
};
class CObject {
public:
......
/*
* direction.h
*
* Created on: 29.05.2011
* Author: gerstrong
*
* Small file which only has the enum for the possible directions in the game.
* It is mainly used by CObject but in some occasions it can be used by other classes or functions
*/
#ifndef DIRECTION_H_
#define DIRECTION_H_
enum direction_t{
NONE,
RIGHT,
LEFT,
UP,
DOWN
};
#endif /* DIRECTION_H_ */
......@@ -13,6 +13,7 @@
#include <stdint.h>
#include <string>
#include "common/direction.h"
struct CEvent { virtual ~CEvent() {} };
......@@ -33,12 +34,16 @@ struct EventExitLevel : CEvent {
* to the council Members or Princess Lindsey
*/
struct EventSendBitmapDialogMsg : CEvent {
uint16_t BitmapID;
std::string Msg;
const uint16_t BitmapID;
const std::string Msg;
const direction_t Direction;
EventSendBitmapDialogMsg(const uint16_t &lBitmapID,
const std::string& lMsg) :
const std::string& lMsg,
const direction_t& lDirection = LEFT) :
BitmapID(lBitmapID),
Msg(lMsg) {}
Msg(lMsg),
Direction(lDirection)
{}
};
......
......@@ -94,19 +94,17 @@ bool CMessages::extractEp4Strings(std::map<std::string, std::string>& StringMap)
StringMap.insert( extractString( "SWIM_SUIT_TEXT", 0x30A4C, 0x30A72 ) );
StringMap.insert( extractString( "ELDERS_TEXT1", 0x30A73, 0x30A94 ) );
StringMap.insert( extractString( "ELDERS_TEXT2", 0x30A95, 0x30AB6 ) );
/*StringMap.insert( extractString( "ELDERS_TEXT3", 0x30AB6, ) );
StringMap.insert( extractString( "ELDERS_TEXT4", , ) );
StringMap.insert( extractString( "ELDERS_TEXT5", , ) );
StringMap.insert( extractString( "ELDERS_TEXT6", , ) );
StringMap.insert( extractString( "ELDERS_TEXT7", , ) );
StringMap.insert( extractString( "ELDERS_TEXT7", , ) );
StringMap.insert( extractString( "ELDERS_TEXT8", , ) );
StringMap.insert( extractString( "ELDERS_TEXT9", , ) );
StringMap.insert( extractString( "ELDERS_TEXT10", , ) );
StringMap.insert( extractString( "ELDERS_TEXTLASTONE", , ) );
*/
StringMap.insert( extractString( "KEEN_NOSWEAT_TEXT", 0x30A73, 0x30A92 ) );
StringMap.insert( extractString( "KEEN_BEARDED_ONE_TEXT", 0x30A93, 0x30AB2 ) );
StringMap.insert( extractString( "KEEN_NO_PROBLEMO_TEXT3", 0x30AB3, 0x30ABF ) );
StringMap.insert( extractString( "KEEN_GREAT_TEXT", 0x30AC0, 0x30AC7 ) );
StringMap.insert( extractString( "KEEN_LOOKS_LIKE_SAME_GUY_TEXT", 0x30AC8, 0x30AFF ) );
StringMap.insert( extractString( "KEEN_GOOD_IDEA_GRAMPS", 0x30B00, 0x30B12 ) );
StringMap.insert( extractString( "KEEN_ROAD_RISE_FEET_TEXT", 0x30B13, 0x30B43 ) );
StringMap.insert( extractString( "KEEN_WISE_PLAN_TEXT", 0x30B44, 0x30B6A ) );
StringMap.insert( extractString( "KEEN_LAST_ELDER_TEXT", 0x30B6B, 0x30BB2 ) );
StringMap.insert( extractString( "ELDERS_UNDERWATER_TEXT", 0x30BB3, 0x30C16 ) );
StringMap.insert( extractString( "ELDERS_TEXT", 0x30C17, 0x30C6A ) );
} break;
}
......
......@@ -140,7 +140,7 @@ void CPlayGameGalaxy::process()
if( EventSendBitmapDialogMsg* ev = EventContainer.occurredEvent<EventSendBitmapDialogMsg>() )
{
MessageBoxQueue.push_back(new CMessageBoxBitmapGalaxy( ev->Msg, ev->BitmapID ) );
MessageBoxQueue.push_back(new CMessageBoxBitmapGalaxy( ev->Msg, ev->BitmapID, ev->Direction ) );
EventContainer.pop_Event();
}
......
......@@ -43,11 +43,14 @@ void CCouncilMember::getTouchedBy(CObject &theObject)
// TODO: Also we need to play the elder sound and the proper Music to it!
// TODO: In this part we have to check which level we are and send the proper messages
std::string elder_text;
elder_text = g_pBehaviorEngine->getString("WORLDMAP_LOAD_TEXT");
EventContainer.add( new EventSendBitmapDialogMsg(0, elder_text) );
EventContainer.add( new EventSendBitmapDialogMsg(1, elder_text) );
std::string elder_text[2];
elder_text[1] = g_pBehaviorEngine->getString("KEEN_NOSWEAT_TEXT");
elder_text[2] = g_pBehaviorEngine->getString("ELDERS_TEXT");
EventContainer.add( new EventSendBitmapDialogMsg(0, elder_text[0], LEFT) );
EventContainer.add( new EventSendBitmapDialogMsg(1, elder_text[1], RIGHT) );
......
#ifndef __CG__VERSION_H__
#define __CG__VERSION_H__
#define CGVERSION "0.3.3.4-testing"
#define CGVERSION "0.3.3.4"
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment