thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Kill storage.h

Browse source
This commit is contained in:
Eugene Sandulenko 2014-12-21 09:11:59 +01:00
parent 62ceb496a9
commit 3a8cafa41e
14 changed files with 28 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/lab/labtext.cpp
View file

@ -29,7 +29,6 @@
*/
#include "lab/stddefines.h"
#include "lab/storage.h"
#include "lab/labfun.h"
namespace Lab {
@ -67,7 +66,7 @@ static void setString(char **string) {
/*****************************************************************************/
bool initLabText(void) {
if ((SizeOfMemChunk = sizeOfFile(LABTEXTFILE)))
if (allocate((void **) &BeginOfMemChunk, SizeOfMemChunk)) {
if ((BeginOfMemChunk = (char *)calloc(SizeOfMemChunk, 1))) {
Common::File *file = openPartial(LABTEXTFILE);
if (file) {
@ -146,7 +145,7 @@ bool initLabText(void) {
/*****************************************************************************/
void freeLabText(void) {
if (SizeOfMemChunk && BeginOfMemChunk)
deallocate(BeginOfMemChunk, SizeOfMemChunk);
free(BeginOfMemChunk);
}