From: <js...@us...> - 2004-12-13 07:33:19
|
Update of /cvsroot/exult/exult In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6200 Modified Files: Makefile.common keyactions.cc keyactions.h keys.cc Log Message: Starting work on a journal (notebook) Index: Makefile.common =================================================================== RCS file: /cvsroot/exult/exult/Makefile.common,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Makefile.common 27 Jun 2004 04:03:41 -0000 1.39 +++ Makefile.common 13 Dec 2004 07:33:09 -0000 1.40 @@ -40,7 +40,7 @@ AudioOptions_gump.o Face_button.o CombatStats_gump.o \ Jawbone_gump.o VideoOptions_gump.o Face_stats.o Gump_manager.o \ Text_button.o GameplayOptions_gump.o CombatOptions_gump.o \ - Enabled_button.o + Enabled_button.o Notebook_gump.o IMAGEWIN_OBJS=imagebuf.o imagewin.o iwin8.o ibuf8.o ibuf16.o imagescl.o \ savepcx.o Index: keyactions.cc =================================================================== RCS file: /cvsroot/exult/exult/keyactions.cc,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- keyactions.cc 26 Jun 2004 23:00:34 -0000 1.60 +++ keyactions.cc 13 Dec 2004 07:33:09 -0000 1.61 @@ -40,6 +40,7 @@ #include "Gamemenu_gump.h" #include "Newfile_gump.h" #include "Face_stats.h" +#include "Notebook_gump.h" #include "Gump_manager.h" #include "effects.h" #include "palette.h" @@ -779,6 +780,15 @@ cheat.change_skin(); } +// { ActionNotebook, 0, "Show notebook", true, false, NONE, false }, +void ActionNotebook(int *params) +{ + Notebook_gump *notes = Notebook_gump::create(); + Game_window *gwin = Game_window::get_instance(); + gwin->get_gump_man()->add_gump(notes); + gwin->paint(); +} + // { ActionSoundTester, 0, "Sound tester", false, true, NONE } void ActionSoundTester(int *params) { Index: keyactions.h =================================================================== RCS file: /cvsroot/exult/exult/keyactions.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- keyactions.h 26 Jun 2004 23:00:35 -0000 1.20 +++ keyactions.h 13 Dec 2004 07:33:09 -0000 1.21 @@ -98,6 +98,7 @@ void ActionNaked(int* params); void ActionPetra(int* params); void ActionSkinColour(int* params); +void ActionNotebook(int* params); void ActionSoundTester(int* params); void ActionTest(int* params); Index: keys.cc =================================================================== RCS file: /cvsroot/exult/exult/keys.cc,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- keys.cc 26 Jun 2004 23:00:35 -0000 1.49 +++ keys.cc 13 Dec 2004 07:33:09 -0000 1.50 @@ -186,6 +186,8 @@ ActionPetra, 0, "Toggle Petra mode", true, true, SERPENT_ISLE, false }, { "CHANGE_SKIN", ActionSkinColour, 0, "Change skin colour", true, true, NONE, false }, + { "NOTEBOOK", ActionNotebook, 0, "Show notebook", true, false, + NONE, false }, { "SOUND_TESTER", ActionSoundTester, 0, "Sound tester", false, true, NONE, false }, { "TEST", ActionTest, 0, "Test", false, false, NONE, false }, |