[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.121,1.122
Chris Apers
chrilith at users.sourceforge.net
Sat Dec 3 11:05:08 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound fmopl.cpp,1.36,1.37
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm PNOMain.cpp,1.7,NONE blit.cpp,1.3,NONE copyrectangle.cpp,1.4,NONE decompressrle0.cpp,1.2,NONE decompressrle7.cpp,1.2,NONE decompresstony.cpp,1.1,NONE drawsprite.cpp,1.2,NONE drawstrip.cpp,1.3,NONE fastshrink.cpp,1.2,NONE macros.h,1.5,NONE native.h,1.7,NONE pno_common.h,1.1,NONE pno_queen.h,1.1,NONE pno_scumm.h,1.1,NONE pno_sword1.h,1.1,NONE pnodefs.h,1.1,NONE proc3.cpp,1.6,NONE renderparallax.cpp,1.2,NONE screendraw.cpp,1.2,NONE widelandscape.cpp,1.4,NONE wideportrait.cpp,1.4,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788
Modified Files:
newgui.cpp
Log Message:
Not needed anymore :)
Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- newgui.cpp 18 Oct 2005 01:30:18 -0000 1.121
+++ newgui.cpp 3 Dec 2005 19:04:33 -0000 1.122
@@ -24,11 +24,6 @@
#include "gui/newgui.h"
#include "gui/dialog.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
DECLARE_SINGLETON(GUI::NewGui);
namespace GUI {
@@ -125,6 +120,7 @@
// This is necessary to get the blending right.
_system->clearOverlay();
_system->grabOverlay((OverlayColor *)_screen.pixels, _screenPitch);
+
for (int i = 0; i < _dialogStack.size(); i++) {
// For each dialog we draw we have to ensure the correct
// scaling mode is active.
@@ -222,7 +218,6 @@
#pragma mark -
void NewGui::saveState() {
-
// Backup old cursor
_oldCursorMode = _system->showMouse(true);
@@ -407,20 +402,6 @@
h = rect.height();
w = rect.width();
-#ifdef PALMOS_68K
- ARM_START(BlendRectType)
- ARM_INIT(COMMON_BLENDRECT)
- ARM_ADDM(w)
- ARM_ADDM(h)
- ARM_ADDM(ptr)
- ARM_ADDM(_screenPitch)
- ARM_ADDM(r)
- ARM_ADDM(g)
- ARM_ADDM(b)
- ARM_ADDM(level)
- ARM_CALL(ARM_COMMON, PNO_DATA())
- ARM_END()
-#endif
while (h--) {
for (int i = 0; i < w; i++) {
_system->colorToRGB(ptr[i], ar, ag, ab);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound fmopl.cpp,1.36,1.37
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/arm PNOMain.cpp,1.7,NONE blit.cpp,1.3,NONE copyrectangle.cpp,1.4,NONE decompressrle0.cpp,1.2,NONE decompressrle7.cpp,1.2,NONE decompresstony.cpp,1.1,NONE drawsprite.cpp,1.2,NONE drawstrip.cpp,1.3,NONE fastshrink.cpp,1.2,NONE macros.h,1.5,NONE native.h,1.7,NONE pno_common.h,1.1,NONE pno_queen.h,1.1,NONE pno_scumm.h,1.1,NONE pno_sword1.h,1.1,NONE pnodefs.h,1.1,NONE proc3.cpp,1.6,NONE renderparallax.cpp,1.2,NONE screendraw.cpp,1.2,NONE widelandscape.cpp,1.4,NONE wideportrait.cpp,1.4,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list