diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rwxr-xr-x | configure.ac | 9 | ||||
| -rw-r--r-- | src/engine.cpp | 34 | ||||
| -rw-r--r-- | src/gui/char_select.cpp | 7 | ||||
| -rw-r--r-- | src/gui/char_server.cpp | 1 | ||||
| -rw-r--r-- | src/gui/scrollarea.cpp | 2 |
6 files changed, 34 insertions, 20 deletions
@@ -4,6 +4,7 @@ - Added diagonal walking with keyboard - Added a choice dialog of how many items to drop - Added handling of window close button +- Upgraded to Guichan 0.3.0 - Chat now appears in a window - Beings now walk a lot smoother - More complete support for new map format (collision, compression) diff --git a/configure.ac b/configure.ac index 062f9732..e5d61e05 100755 --- a/configure.ac +++ b/configure.ac @@ -13,10 +13,13 @@ AC_PROG_MAKE_SET # (someone may want to exchange these symbols with # something more meaningful in the future /- kth5) AC_CHECK_LIB([guichan], [gcnGuichanVersion], , -AC_MSG_ERROR([ *** Unable to find Guichan library (guichan.darkbits.org)])) +AC_MSG_ERROR([ *** Unable to find Guichan library (guichan.sf.net)])) -#AC_CHECK_LIB([guichan_sdl], [_init], , -#AC_MSG_ERROR([ *** Unable to find Guichan SDL library (guichan.darkbits.org)])) +#AC_CHECK_LIB([guichan_sdl], [gcnSDL], , +#AC_MSG_ERROR([ *** Unable to find Guichan SDL library (guichan.sf.net)])) + +#AC_CHECK_LIB([guichan_opengl], [gcnOpenGL], , +#AC_MSG_ERROR([ *** Unable to find Guichan OpenGL library (guichan.sf.net)])) AC_CHECK_LIB([physfs], [PHYSFS_init], , AC_MSG_ERROR([ *** Unable to find PhysFS library (icculus.org/physfs/)])) diff --git a/src/engine.cpp b/src/engine.cpp index c852c861..7785313f 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -62,23 +62,23 @@ EquipmentWindow *equipmentWindow; ChargeDialog *chargeDialog; char hairtable[16][4][2] = { - // S(x,y) W(x,y) N(x,y) E(x,y) - { { 0, 0}, {-1, 2}, {-1, 2}, {0, 2} }, // STAND - { { 0, 2}, {-2, 3}, {-1, 2}, {1, 3} }, // WALK 1st frame - { { 0, 3}, {-2, 4}, {-1, 3}, {1, 4} }, // WALK 2nd frame - { { 0, 1}, {-2, 2}, {-1, 2}, {1, 2} }, // WALK 3rd frame - { { 0, 2}, {-2, 3}, {-1, 2}, {1, 3} }, // WALK 4th frame - { { 0, 1}, {1, 2}, {-1, 3}, {-2, 2} }, // ATTACK 1st frame - { { 0, 1}, {-1, 2}, {-1, 3}, {0, 2} }, // ATTACK 2nd frame - { { 0, 2}, {-4, 3}, {0, 4}, {3, 3} }, // ATTACK 3rd frame - { { 0, 2}, {-4, 3}, {0, 4}, {3, 3} }, // ATTACK 4th frame - { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 1st frame - { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 2nd frame - { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 3rd frame - { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 4th frame - { { 0, 4}, {-1, 6}, {-1, 6}, {0, 6} }, // SIT - { { 0, 0}, {0, 0}, {0, 0}, {0, 0} }, // ?? HIT - { { 0, 16}, {-1, 6}, {-1, 6}, {0, 6} } // DEAD + // S(x,y) W(x,y) N(x,y) E(x,y) + { { 0, 0}, {-1, 2}, {-1, 2}, { 0, 2} }, // STAND + { { 0, 2}, {-2, 3}, {-1, 2}, { 1, 3} }, // WALK 1st frame + { { 0, 3}, {-2, 4}, {-1, 3}, { 1, 4} }, // WALK 2nd frame + { { 0, 1}, {-2, 2}, {-1, 2}, { 1, 2} }, // WALK 3rd frame + { { 0, 2}, {-2, 3}, {-1, 2}, { 1, 3} }, // WALK 4th frame + { { 0, 1}, { 1, 2}, {-1, 3}, {-2, 2} }, // ATTACK 1st frame + { { 0, 1}, {-1, 2}, {-1, 3}, { 0, 2} }, // ATTACK 2nd frame + { { 0, 2}, {-4, 3}, { 0, 4}, { 3, 3} }, // ATTACK 3rd frame + { { 0, 2}, {-4, 3}, { 0, 4}, { 3, 3} }, // ATTACK 4th frame + { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 1st frame + { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 2nd frame + { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 3rd frame + { { 0, 0}, {-1, 2}, {-1, 2}, {-1, 2} }, // BOW_ATTACK 4th frame + { { 0, 4}, {-1, 6}, {-1, 6}, { 0, 6} }, // SIT + { { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0} }, // ?? HIT + { { 0, 16}, {-1, 6}, {-1, 6}, { 0, 6} } // DEAD }; int get_x_offset(Being *being) diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index e9e8609b..ad71cb31 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -433,6 +433,13 @@ void charSelect() case SDL_QUIT: state = EXIT; break; + + case SDL_KEYDOWN: + if (event.key.keysym.sym == SDLK_ESCAPE) + { + state = EXIT; + } + break; } guiInput->pushInput(event); diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index cb085053..a4a433a7 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -125,6 +125,7 @@ void char_server() { switch (event.type) { case SDL_QUIT: state = EXIT; + showServerList = false; break; case SDL_KEYDOWN: diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index 9bbdf797..d262d355 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -77,6 +77,8 @@ void ScrollArea::init() void ScrollArea::draw(gcn::Graphics *graphics) { + checkPolicies(); + int alpha = getBaseColor().a; gcn::Color highlightColor = getBaseColor() + 0x303030; highlightColor.a = alpha; |