[Scummvm-cvs-logs] scummvm master -> 9e617d0dfddf91e5802c783fae5be679afe22b05

wjp wjp at usecode.org
Wed Dec 7 19:23:46 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9e617d0dfd Merge pull request #127 from fingolfin/dreamweb-cleanup


Commit: 9e617d0dfddf91e5802c783fae5be679afe22b05
    https://github.com/scummvm/scummvm/commit/9e617d0dfddf91e5802c783fae5be679afe22b05
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-07T10:23:21-08:00

Commit Message:
Merge pull request #127 from fingolfin/dreamweb-cleanup

Dreamweb: Remove more dead stuff, advance DreamBase <-> DreamGenContext split

Changed paths:
    devtools/tasmrecover/tasm-recover
    devtools/tasmrecover/tasm/cpp.py
    engines/dreamweb/dreambase.h
    engines/dreamweb/dreamgen.cpp
    engines/dreamweb/dreamgen.h
    engines/dreamweb/dreamweb.cpp
    engines/dreamweb/dreamweb.h
    engines/dreamweb/monitor.cpp
    engines/dreamweb/object.cpp
    engines/dreamweb/pathfind.cpp
    engines/dreamweb/people.cpp
    engines/dreamweb/runtime.h
    engines/dreamweb/saveload.cpp
    engines/dreamweb/sprite.cpp
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h
    engines/dreamweb/vgagrafx.cpp



diff --cc engines/dreamweb/stubs.h
index 4b22ee0,d03961d..1b80818
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@@ -29,12 -29,8 +29,9 @@@
  	void switchRyanOn();
  	void switchRyanOff();
  	uint16 allocateMem(uint16 paragraphs);
 +	void deallocateMem();
  	void deallocateMem(uint16 segment);
- 	uint8 *workspace();
  	uint8 *textUnder();
- 	void allocateWork();
- 	void clearWork();
  	uint16 standardLoad(const char *fileName, uint16 *outSizeInBytes = NULL); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
  	void *standardLoadCPP(const char *fileName, uint16 *outSizeInBytes = NULL); // And this one should be 'free'd
  	void loadIntoTemp();






More information about the Scummvm-git-logs mailing list