diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2004-12-25 16:46:27 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2004-12-25 16:46:27 +0000 |
| commit | 587275709eb11a036ed474bf6a61f1fd34fc069f (patch) | |
| tree | 9c1f073168b1d38e87afdd11427e924340a2d901 | |
| parent | 8e9952956dddf37edefeb69c009def3f0dff23eb (diff) | |
| download | mana-587275709eb11a036ed474bf6a61f1fd34fc069f.tar.gz mana-587275709eb11a036ed474bf6a61f1fd34fc069f.tar.bz2 mana-587275709eb11a036ed474bf6a61f1fd34fc069f.tar.xz mana-587275709eb11a036ed474bf6a61f1fd34fc069f.zip | |
Fixed error causing monster death bitmaps not to show up.
| -rwxr-xr-x | data/graphic/.cvsignore | 1 | ||||
| -rw-r--r-- | src/graphic/graphic.cpp | 4 | ||||
| -rw-r--r-- | src/gui/char_server.h | 9 | ||||
| -rw-r--r-- | src/gui/login.h | 15 |
4 files changed, 24 insertions, 5 deletions
diff --git a/data/graphic/.cvsignore b/data/graphic/.cvsignore new file mode 100755 index 00000000..49c6ba36 --- /dev/null +++ b/data/graphic/.cvsignore @@ -0,0 +1 @@ +screenshot.bmp diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp index c391f75b..46413d2b 100644 --- a/src/graphic/graphic.cpp +++ b/src/graphic/graphic.cpp @@ -398,8 +398,8 @@ void do_graphic(void) { int mf = node->frame + node->action; if (node->action == MONSTER_DEAD) { - new_monsterset->spriteset[sprnum * MONSTER_DEAD]->draw(vbuffer, - node->text_x, node->text_y); + new_monsterset->spriteset[sprnum + 8 * MONSTER_DEAD]->draw( + vbuffer, node->text_x, node->text_y); } else { new_monsterset->spriteset[sprnum + 8 * mf]->draw(vbuffer, diff --git a/src/gui/char_server.h b/src/gui/char_server.h index 66ea52bf..2f2a6f46 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -52,7 +52,16 @@ class ServerListModel : public gcn::ListModel { */ class ServerSelectDialog : public Window, public gcn::ActionListener { public: + /** + * Constructor + * + * @see Window::Window + */ ServerSelectDialog(gcn::Container *parent); + + /** + * Destructor + */ ~ServerSelectDialog(); /** diff --git a/src/gui/login.h b/src/gui/login.h index 46c12d08..884b0fd0 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -19,13 +19,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef _TMW_LOGIN_H +#define _TMW_LOGIN_H + #ifdef WIN32 #pragma warning (disable:4312) #endif -#ifndef _LOGIN_H -#define _LOGIN_H - #include "../main.h" #include "../log.h" #include "../net/network.h" @@ -43,7 +43,16 @@ */ class LoginDialog : public Window, public gcn::ActionListener { public: + /** + * Constructor + * + * @see Window::Window + */ LoginDialog(gcn::Container *parent); + + /** + * Destructor + */ ~LoginDialog(); /** |