[Scummvm-cvs-logs] SF.net SVN: scummvm:[49975] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri Jun 18 01:53:31 CEST 2010
Revision: 49975
http://scummvm.svn.sourceforge.net/scummvm/?rev=49975&view=rev
Author: thebluegr
Date: 2010-06-17 23:53:30 +0000 (Thu, 17 Jun 2010)
Log Message:
-----------
Strict mode: error out on unhandled subops, to note if they actually exist and where they're used
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/graphics/paint16.cpp
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-06-17 23:52:17 UTC (rev 49974)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-06-17 23:53:30 UTC (rev 49975)
@@ -173,7 +173,7 @@
g_sci->_gfxCursor->kernelSetView(argv[0].toUint16(), argv[1].toUint16(), argv[2].toUint16(), hotspot);
break;
default :
- warning("kSetCursor: Unhandled case: %d arguments given", argc);
+ error("kSetCursor: Unhandled case: %d arguments given", argc);
break;
}
return s->r_acc;
@@ -186,7 +186,7 @@
case SCI_VERSION_1_1:
return kSetCursorSci11(s, argc, argv);
default:
- warning("Unknown SetCursor type");
+ error("Unknown SetCursor type");
return NULL_REG;
}
}
@@ -316,7 +316,7 @@
return g_sci->_gfxPaint16->kernelGraphSaveUpscaledHiresBox(rect);
default:
- warning("Unsupported kGraph() operation %04x", argv[0].toSint16());
+ error("Unsupported kGraph() operation %04x", argv[0].toSint16());
}
return s->r_acc;
@@ -627,7 +627,7 @@
break;
}
default:
- warning("kPalette(%d), not implemented", argv[0].toUint16());
+ error("kPalette(%d), not implemented", argv[0].toUint16());
}
return s->r_acc;
@@ -680,7 +680,7 @@
break;
}
default:
- warning("kPalVary(%d), not implemented (argc = %d)", operation, argc);
+ error("kPalVary(%d), not implemented (argc = %d)", operation, argc);
}
return NULL_REG;
}
@@ -702,7 +702,7 @@
Common::String resourceName = s->_segMan->getString(argv[1]);
s->r_acc = g_sci->_gfxPaint16->kernelPortraitLoad(resourceName);
} else {
- warning("kPortrait(loadResource) called with unsupported argc %d", argc);
+ error("kPortrait(loadResource) called with unsupported argc %d", argc);
}
break;
}
@@ -720,7 +720,7 @@
g_sci->_gfxPaint16->kernelPortraitShow(resourceName, position, resourceNum, noun, verb, cond, seq);
return SIGNAL_REG;
} else {
- warning("kPortrait(show) called with unsupported argc %d", argc);
+ error("kPortrait(show) called with unsupported argc %d", argc);
}
break;
}
@@ -729,12 +729,12 @@
uint16 portraitId = argv[1].toUint16();
g_sci->_gfxPaint16->kernelPortraitUnload(portraitId);
} else {
- warning("kPortrait(unload) called with unsupported argc %d", argc);
+ error("kPortrait(unload) called with unsupported argc %d", argc);
}
break;
}
default:
- warning("kPortrait(%d), not implemented (argc = %d)", operation, argc);
+ error("kPortrait(%d), not implemented (argc = %d)", operation, argc);
}
return s->r_acc;
@@ -1160,7 +1160,7 @@
initGraphics(screenWidth, screenHeight, screenWidth > 320, NULL);
if (g_system->getScreenFormat().bytesPerPixel == 1) {
- warning("This video requires >8bpp color to be displayed, but could not switch to RGB color mode.");
+ error("This video requires >8bpp color to be displayed, but could not switch to RGB color mode.");
return NULL_REG;
}
Modified: scummvm/trunk/engines/sci/graphics/paint16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint16.cpp 2010-06-17 23:52:17 UTC (rev 49974)
+++ scummvm/trunk/engines/sci/graphics/paint16.cpp 2010-06-17 23:53:30 UTC (rev 49975)
@@ -514,7 +514,7 @@
bRedraw = 0;
break;
default:
- warning("Unknown kDisplay argument %X", displayArg);
+ error("Unknown kDisplay argument %X", displayArg);
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list