From: Laszlo T. <ave...@us...> - 2004-08-23 21:46:36
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/GUIScript In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18730/plugins/GUIScript Modified Files: GUIScript.cpp Log Message: Removed the 'allowtravelbymap' flag and implemented this feature via guiscript. Index: GUIScript.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/GUIScript/GUIScript.cpp,v retrieving revision 1.195 retrieving revision 1.196 diff -C2 -d -r1.195 -r1.196 *** GUIScript.cpp 22 Aug 2004 22:10:05 -0000 1.195 --- GUIScript.cpp 23 Aug 2004 21:46:26 -0000 1.196 *************** *** 1571,1583 **** PyDoc_STRVAR( GemRB_CreateWorldMapControl__doc, ! "CreateWorldMapControl(WindowIndex, ControlID, x, y, w, h) => ControlIndex\n\n" "Creates and adds a new WorldMap control to a Window." ); static PyObject* GemRB_CreateWorldMapControl(PyObject * /*self*/, PyObject* args) { ! int WindowIndex, ControlID, x, y, w, h; ! if (!PyArg_ParseTuple( args, "iiiiii", &WindowIndex, &ControlID, &x, ! &y, &w, &h )) { return AttributeError( GemRB_CreateWorldMapControl__doc ); } --- 1571,1583 ---- PyDoc_STRVAR( GemRB_CreateWorldMapControl__doc, ! "CreateWorldMapControl(WindowIndex, ControlID, x, y, w, h, flags) => ControlIndex\n\n" "Creates and adds a new WorldMap control to a Window." ); static PyObject* GemRB_CreateWorldMapControl(PyObject * /*self*/, PyObject* args) { ! int WindowIndex, ControlID, x, y, w, h, flags; ! if (!PyArg_ParseTuple( args, "iiiiiii", &WindowIndex, &ControlID, &x, ! &y, &w, &h, &flags )) { return AttributeError( GemRB_CreateWorldMapControl__doc ); } *************** *** 1595,1602 **** wmap->ControlType = IE_GUI_WORLDMAP; wmap->Owner = win; ! #if 0 ! lbl->SetText( text ); ! lbl->SetAlignment( align ); ! #endif win->AddControl( wmap ); --- 1595,1599 ---- wmap->ControlType = IE_GUI_WORLDMAP; wmap->Owner = win; ! wmap->Value = flags; win->AddControl( wmap ); |