Commit 8615f1bbad630602009c04a317cd83e03aaa620c

Jared Adams
Thu Jun 03 22:23:08 CEST 2010

Tree SHA1: 6f1aaad
Parent SHA1: 24802c1 (Fix an unitialized variable problem in Theme)
raw diff | raw patch

Unload loaded DBs before loading them again

This greatly simplifies handling DBs when changing states. No more
need to manage unloading in Client (except when exiting).

Reviewed-by: Thorbjørn Lindeijer

Diff rendering mode:
inline
side by side


422	422	SDL_RemoveTimer(mLogicCounterId);
423	423	SDL_RemoveTimer(mSecondsCounterId);
424	424
	425	// Unload XML databases
	426	ColorDB::unload();
	427	EmoteDB::unload();
	428	ItemDB::unload();
	429	MonsterDB::unload();
	430	NPCDB::unload();
	431	StatusEffect::unload();
	432
425	433	// Before config.write() since it writes the shortcuts to the config
426	434	delete itemShortcut;
427	435	delete emoteShortcut;
…	…
583	583	{
584	584	delete game;
585	585	game = 0;
586
587		// Unload XML databases
588		ColorDB::unload();
589		EmoteDB::unload();
590		ItemDB::unload();
591		MonsterDB::unload();
592		NPCDB::unload();
593		StatusEffect::unload();
594	586	}
595	587
596	588	mOldState = mState;


36	36	void ColorDB::load()
37	37	{
38	38	if (mLoaded)
39		return;
	39	unload();
40	40
41	41	XML::Document *doc = new XML::Document("hair.xml");
42	42	xmlNodePtr root = doc->rootNode();


36	36	void EmoteDB::load()
37	37	{
38	38	if (mLoaded)
39		return;
	39	unload();
40	40
41	41	mLastEmote = 0;
42	42


108	108	void ItemDB::load()
109	109	{
110	110	if (mLoaded)
111		return;
	111	unload();
112	112
113	113	logger->log("Initializing item database...");
114	114


43	43	void MonsterDB::load()
44	44	{
45	45	if (mLoaded)
46		return;
	46	unload();
47	47
48	48	mUnknown.addSprite("error.xml");
49	49


35	35	void NPCDB::load()
36	36	{
37	37	if (mLoaded)
38		return;
	38	unload();
39	39
40	40	NPCsprite *unknownSprite = new NPCsprite;
41	41	unknownSprite->sprite = "error.xml";


32	32
33	33	#define STATUS_EFFECTS_FILE "status-effects.xml"
34	34
	35	bool StatusEffect::mLoaded = false;
	36
35	37	StatusEffect::StatusEffect() :
36	38	mPersistentParticleEffect(false)
37	39	{}
…	…
115	115
116	116	void StatusEffect::load()
117	117	{
	118	if (mLoaded)
	119	unload();
	120
118	121	XML::Document doc(STATUS_EFFECTS_FILE);
119	122	xmlNodePtr rootNode = doc.rootNode();
120	123
…	…
180	180
181	181	void StatusEffect::unload()
182	182	{
	183	if (!mLoaded)
	184	return;
	185
183	186	unloadMap(statusEffects[0]);
184	187	unloadMap(statusEffects[1]);
185	188	unloadMap(stunEffects[0]);
186	189	unloadMap(stunEffects[1]);
	190
	191	mLoaded = false;
187	192	}


98	98
99	99	static void unload();
100	100	private:
	101	static bool mLoaded;
101	102
102	103	std::string mMessage;
103	104	std::string mSFXEffect;

Commit 8615f1bbad630602009c04a317cd83e03aaa620c

Gitorious