aboutsummaryrefslogtreecommitdiff
path: root/kyra/screen.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2005-12-09 17:36:57 +0000
committerJohannes Schickel2005-12-09 17:36:57 +0000
commit69114bb80dc8b8f0c4326e2aed43050ed3d52124 (patch)
tree3613414c77971956f042e1e6296ef094a03975e0 /kyra/screen.cpp
parent1fc81a08fa6eab8d29b8e0d443501727b1c6c224 (diff)
downloadscummvm-rg350-69114bb80dc8b8f0c4326e2aed43050ed3d52124.tar.gz
scummvm-rg350-69114bb80dc8b8f0c4326e2aed43050ed3d52124.tar.bz2
scummvm-rg350-69114bb80dc8b8f0c4326e2aed43050ed3d52124.zip
Finished item pick up code.
Changed writing of stack access in the script functions. Also fixed typo with cmdPoisonBrandonAndRemaps. svn-id: r19764
Diffstat (limited to 'kyra/screen.cpp')
-rw-r--r--kyra/screen.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/kyra/screen.cpp b/kyra/screen.cpp
index 84d0928a7a..91ba5bda36 100644
--- a/kyra/screen.cpp
+++ b/kyra/screen.cpp
@@ -567,7 +567,8 @@ void Screen::setScreenDim(int dim) {
void Screen::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y, int sd, int flags, ...) {
debug(9, "Screen::drawShape(%d, 0x%X, %d, %d, %d, 0x%.04X, ...)", pageNum, shapeData, x, y, sd, flags);
- assert(shapeData);
+ if (!shapeData)
+ return;
va_list args;
va_start(args, flags);