aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2015-02-19 15:18:57 +0200
committerEugene Sandulenko2015-12-15 00:05:02 +0100
commit35751e0f123338927ea4bfdf6f6311229a25f054 (patch)
tree908f64255236e54fd85e4d7e0f1dd70cc070d002
parent7ddbc55251380cee95d25ce7a25788af069d4cab (diff)
downloadscummvm-rg350-35751e0f123338927ea4bfdf6f6311229a25f054.tar.gz
scummvm-rg350-35751e0f123338927ea4bfdf6f6311229a25f054.tar.bz2
scummvm-rg350-35751e0f123338927ea4bfdf6f6311229a25f054.zip
LAB: Implement getCurMemLabFile()
-rw-r--r--engines/lab/labfile.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/lab/labfile.cpp b/engines/lab/labfile.cpp
index 2f9355444f..4cbbd5403e 100644
--- a/engines/lab/labfile.cpp
+++ b/engines/lab/labfile.cpp
@@ -112,18 +112,15 @@ static void freeFile(uint16 RMarker) {
/*****************************************************************************/
/* Gets a chunk of memory from the buffer. */
/*****************************************************************************/
-static void *getCurMem(uint32 size) {
+static void *getCurMemLabFile(uint32 size) {
void *ptr = 0;
- warning ("STUB: getCurMem(%d)", size);
-
-#if 0
if ((((char *) MemPlace) + size - 1) >=
(((char *) buffer) + buffersize))
MemPlace = buffer;
ptr = MemPlace;
- ((char *)MemPlace) += size;
+ MemPlace = (char *)MemPlace + size;
for (int counter = 0; counter < MAXMARKERS; counter++) {
if (FileMarkers[counter].name[0]) {
@@ -137,7 +134,7 @@ static void *getCurMem(uint32 size) {
freeFile(counter);
}
}
-#endif
+
return ptr;
}
@@ -198,7 +195,7 @@ bool allocFile(void **Ptr, uint32 Size, const char *fileName) {
freeFile(RMarker);
strcpy(FileMarkers[RMarker].name, fileName);
- *Ptr = getCurMem(Size);
+ *Ptr = getCurMemLabFile(Size);
FileMarkers[RMarker].Start = *Ptr;
FileMarkers[RMarker].End = (void *)(((char *)(*Ptr)) + Size - 1);