[gunzemulator] r354 committed - Bleh. I thought I got rid of all of those.

0 views

Skip to first unread message

gunzem...@googlecode.com

unread,

Jun 28, 2010, 12:04:17 PM6/28/10

to gogo-dev...@googlegroups.com

Revision: 354
Author: cg.wowus.cg
Date: Mon Jun 28 09:02:44 2010
Log: Bleh. I thought I got rid of all of those.
http://code.google.com/p/gunzemulator/source/detail?r=354

Modified:
/trunk/database/src/MySQL/modules/DeleteCharacter.cpp
/trunk/gogo/src/modules/OnCharDelete.cpp
/trunk/include/database/GunzDB.h
/trunk/include/database/MySQLGunzDB.h

=======================================
--- /trunk/database/src/MySQL/modules/DeleteCharacter.cpp Sun Jun 27
13:12:05 2010
+++ /trunk/database/src/MySQL/modules/DeleteCharacter.cpp Mon Jun 28
09:02:44 2010
@@ -19,19 +19,19 @@
return q;
}

-void MySQLGunzDB::DeleteCharacter(uint32_t aid, uint32_t marker)
+void MySQLGunzDB::DeleteCharacter(const AccountInfo& acc, uint32_t marker)
{
if(marker > 3)
return;

- if(aid == 0xFFFFFFFF)
+ if(!acc.isValid)
throw InvalidAccountInfo();

exec_query(
- bind(make_delete_character_query, _1, aid, marker)
+ bind(make_delete_character_query, _1, acc.AccountId, marker)
);

exec_query(
- bind(make_update_marker_info_query, _1, aid, marker)
+ bind(make_update_marker_info_query, _1, acc.AccountId, marker)
);
}
=======================================
--- /trunk/gogo/src/modules/OnCharDelete.cpp Mon Jun 28 08:58:55 2010
+++ /trunk/gogo/src/modules/OnCharDelete.cpp Mon Jun 28 09:02:44 2010
@@ -20,6 +20,6 @@
if(!myAccount.isValid)
return transmitter->disconnect();

- database->DeleteCharacter(myAccount.AccountId, charMarker);
+ database->DeleteCharacter(myAccount, charMarker);
transmitter->send(packet::protocol::Match_ResponseDeleteChar(PEC_NONE));
}
=======================================
--- /trunk/include/database/GunzDB.h Sun Jun 27 16:05:52 2010
+++ /trunk/include/database/GunzDB.h Mon Jun 28 09:02:44 2010
@@ -36,10 +36,10 @@
/**
Deletes a character from the database. FOREVAR!

- @param aid The account ID of the owning player.
+ @param acc The account info of the owning player.
@param marker Where in the character list (0-3) the character to be
deleted is.
*/
- virtual void DeleteCharacter(boost::uint32_t aid, boost::uint32_t marker)
= 0;
+ virtual void DeleteCharacter(const AccountInfo& acc, boost::uint32_t
marker) = 0;

/**
Gets the character info from an account identifier.
=======================================
--- /trunk/include/database/MySQLGunzDB.h Sun Jun 27 16:05:52 2010
+++ /trunk/include/database/MySQLGunzDB.h Mon Jun 28 09:02:44 2010
@@ -89,7 +89,7 @@
//Login Process related functions
AccountInfo GetAccountInfo(const std::string& user, const std::string&
password);

- void DeleteCharacter(boost::uint32_t cid, boost::uint32_t marker);
+ void DeleteCharacter(const AccountInfo& acc, boost::uint32_t marker);