Index: lib/framework/frame.c =================================================================== --- lib/framework/frame.c (revision 1628) +++ lib/framework/frame.c (working copy) @@ -321,7 +321,8 @@ { if (filesize > *pFileSize) { - debug(LOG_ERROR, "loadFile2: No room for file %s", pFileName); + debug(LOG_ERROR, "loadFile2: No room for file, GeneralBuffer is too small! %s", pFileName); + debug(LOG_ERROR, "Report this to Devs immediately! Was %d needs %d", *pFileSize,filesize); assert(FALSE); return FALSE; } Index: src/frontend.c =================================================================== --- src/frontend.c (revision 1628) +++ src/frontend.c (working copy) @@ -597,21 +597,21 @@ { initLoadingScreen( TRUE ); /* if (!resLoad("wrf/forcedit.wrf", 500, - DisplayBuffer, displayBufferSize)) + GeneralBuffer, GeneralBufferSize)) //need the object heaps to have been set up before loading { return FALSE; } */ if (!resLoad("wrf/piestats.wrf", 501, - DisplayBuffer, displayBufferSize)) + GeneralBuffer, GeneralBufferSize)) //need the object heaps to have been set up before loading { return FALSE; } if (!resLoad("wrf/forcedit2.wrf", 502, - DisplayBuffer, displayBufferSize)) + GeneralBuffer, GeneralBufferSize)) //need the object heaps to have been set up before loading { return FALSE; Index: src/game.c =================================================================== --- src/game.c (revision 1628) +++ src/game.c (working copy) @@ -1369,8 +1369,8 @@ UDWORD fileSize; /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(pGameToLoad, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(pGameToLoad, pFileData, GeneralBufferSize, &fileSize)) { debug(LOG_ERROR, "loadGameInit: Fail1\n" ); goto error; @@ -1431,8 +1431,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "proxstate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the proximity status data if (pFileData) @@ -1460,8 +1460,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "messtate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the message status data if (pFileData) @@ -1812,8 +1812,8 @@ powerCalculated = FALSE; /* Load in the chosen file data */ /* - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { DBPRINTF(("loadgame: Fail2\n")); goto error; @@ -1841,8 +1841,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "ttypes.ttp"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail23\n" ); goto error; @@ -1905,8 +1905,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "templ.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail20\n" ); goto error; @@ -1940,8 +1940,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "mission.map"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { if (!mapLoad(pFileData, fileSize)) { @@ -1954,8 +1954,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "misvis.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the visibility data if (pFileData) @@ -1979,8 +1979,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "mfeat.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail14\n" ); goto error; @@ -1997,8 +1997,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "mstruct.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail17\n" ); goto error; @@ -2035,8 +2035,8 @@ strcat(aFileName, "munit.bjo"); } /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the data into mission.apsDroidLists //ppsCurrentDroidLists = mission.apsDroidLists; @@ -2072,8 +2072,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "mflagstate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadMissionExtras: Fail 3\n" ); return FALSE; @@ -2113,8 +2113,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "game.map"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail5\n" ); goto error; @@ -2131,8 +2131,8 @@ /* aFileName[fileExten] = '\0'; strcat(aFileName, "gates.txt"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { DBPRINTF(("loadgame: Failed to load gates.txt\n")); goto error; @@ -2175,8 +2175,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "resstate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail32\n" ); goto error; @@ -2200,8 +2200,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "dinit.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail8\n" ); goto error; @@ -2228,8 +2228,8 @@ strcat(aFileName, "unit.bjo"); } /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail11\n" ); goto error; @@ -2279,8 +2279,8 @@ strcat(aFileName, "munit.bjo"); } /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) { + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the data into mission.apsDroidLists //ppsCurrentDroidLists = mission.apsDroidLists; if (!loadSaveDroid(pFileData, fileSize, mission.apsDroidLists)) @@ -2303,8 +2303,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "limbo.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the data into apsDroidLists //ppsCurrentDroidLists = apsLimboDroids; @@ -2322,8 +2322,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "feat.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail14\n" ); goto error; @@ -2344,8 +2344,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "struct.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail17\n" ); goto error; @@ -2377,8 +2377,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "compl.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail26\n" ); goto error; @@ -2399,8 +2399,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "strtype.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail29\n" ); goto error; @@ -2431,8 +2431,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "visstate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the visibility data if (pFileData) @@ -2462,8 +2462,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "prodstate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the visibility data if (pFileData) @@ -2491,8 +2491,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "fxstate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the fx data if (pFileData) @@ -2521,8 +2521,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "score.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (loadFileToBufferNoError(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (loadFileToBufferNoError(aFileName, pFileData, GeneralBufferSize, &fileSize)) { //load the fx data if (pFileData) @@ -2553,8 +2553,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "flagstate.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadMissionExtras: Fail 3\n"); return FALSE; @@ -2585,8 +2585,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "command.bjo"); // Load in the chosen file data - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadMissionExtras: Fail 5\n" ); return FALSE; @@ -2613,8 +2613,8 @@ aFileName[fileExten] = '\0'; strcat(aFileName, "limits.bjo"); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail17\n" ); goto error; @@ -3515,8 +3515,8 @@ debug(LOG_WZ, "getCampaign: %s", pGameToLoad); /* Load in the chosen file data */ - pFileData = DisplayBuffer; - if (!loadFileToBuffer(pGameToLoad, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(pGameToLoad, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "loadgame: Fail2\n" ); return 0; @@ -11300,8 +11300,8 @@ pFileName[strlen(pFileName)-4] = (char)0; strcat(pFileName, ".es"); - pFileData = DisplayBuffer; - if (!loadFileToBuffer(pFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(pFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_ERROR, "loadScriptState: couldn't load %s", pFileName ); abort(); @@ -11461,8 +11461,8 @@ aFileName[strlen(aFileName)-4] = '\0'; strcat(aFileName, "/struct.bjo"); - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "plotStructurePreview: Fail1\n" ); } @@ -11596,8 +11596,8 @@ aFileName[strlen(aFileName)-4] = '\0'; strcat(aFileName, "/struct.bjo"); - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug( LOG_NEVER, "plotStructurePreview16: Fail1\n" ); } Index: src/hci.c =================================================================== --- src/hci.c (revision 1628) +++ src/hci.c (working copy) @@ -142,8 +142,8 @@ CURSORSNAP InterfaceSnap; -char *DisplayBuffer; -UDWORD displayBufferSize; +char *GeneralBuffer; +UDWORD GeneralBufferSize; /***************************************************************************************/ @@ -4132,10 +4132,19 @@ return FALSE; } #endif - + //in case above is re-enabled, I did NO change to below. + //this way if above is re-enable, no code change below required. + //otherwise, if you change += to =, then it breaks position when + //above reenabled. + //other option is just to stick back #ifdef EDIT_OPTIONS that was removed in rev1606 + sButInit.formID = IDOPT_FORM; //this all required to set default values. + sButInit.x = OPT_GAP; + sButInit.y = OPT_EDITY; + sButInit.width = OPT_BUTWIDTH; + sButInit.height = OPT_BUTHEIGHT; /* Add the add object buttons */ sButInit.id = IDOPT_DROID; - sButInit.x += OPT_GAP + OPT_BUTWIDTH; + sButInit.x += OPT_GAP + OPT_BUTWIDTH; sButInit.pText = "Unit"; sButInit.pTip = "Place Unit on map"; if (!widgAddButton(psWScreen, &sButInit)) Index: src/hci.h =================================================================== --- src/hci.h (revision 1628) +++ src/hci.h (working copy) @@ -319,8 +319,8 @@ extern CURSORSNAP InterfaceSnap; -extern char *DisplayBuffer; -extern UDWORD displayBufferSize; +extern char *GeneralBuffer; +extern UDWORD GeneralBufferSize; extern BOOL ClosingMessageView; Index: src/init.c =================================================================== --- src/init.c (revision 1628) +++ src/init.c (working copy) @@ -108,6 +108,7 @@ extern char * campaign_mods[]; extern char * multiplay_mods[]; +extern _CrtMemState memstate1, memstate2, memstate3 ; //for debug memory // Ascii to font image id lookup table for frontend font. // @@ -955,14 +956,14 @@ pie_SetGammaValue((float)gammaValue / 20.0f); - displayBufferSize = pie_GetVideoBufferWidth()*pie_GetVideoBufferHeight()*2; - if (displayBufferSize < 5000000) +// GeneralBufferSize= pie_GetVideoBufferWidth()*pie_GetVideoBufferHeight()*2; +// if (GeneralBufferSize< 5000000) +// { + GeneralBufferSize= 200000; //biggest data file I found was under 200K +// } + GeneralBuffer = (char*)malloc(GeneralBufferSize); + if (GeneralBuffer == NULL) { - displayBufferSize = 5000000; - } - DisplayBuffer = (char*)malloc(displayBufferSize); - if (DisplayBuffer == NULL) - { debug( LOG_ERROR, "Unable to allocate memory for display buffer" ); abort(); return FALSE; @@ -1052,8 +1053,8 @@ } debug(LOG_MAIN, "shutting down graphics subsystem"); - free(DisplayBuffer); - DisplayBuffer = NULL; + free(GeneralBuffer); + GeneralBuffer = NULL; iV_ShutDown(); levShutDown(); widgShutDown(); @@ -1146,7 +1147,7 @@ } debug(LOG_MAIN, "frontEndInitialise: loading resource file ....."); - if (!resLoad(ResourceFile, 0, DisplayBuffer, displayBufferSize)) + if (!resLoad(ResourceFile, 0, GeneralBuffer, GeneralBufferSize)) { //need the object heaps to have been set up before loading in the save game return FALSE; Index: src/levels.c =================================================================== --- src/levels.c (revision 1628) +++ src/levels.c (working copy) @@ -553,7 +563,7 @@ // load the data debug(LOG_WZ, "levLoadSingleWRF: Loading %s ...", pName); - if (!resLoad(pName, 0, DisplayBuffer, displayBufferSize)) + if (!resLoad(pName, 0, GeneralBuffer, GeneralBufferSize)) { return FALSE; } @@ -616,7 +626,7 @@ // load the data debug(LOG_WZ, "levLoadBaseData: Loading %s", psBaseData->apDataFiles[i]); if (!resLoad(psBaseData->apDataFiles[i], i, - DisplayBuffer, displayBufferSize)) + GeneralBuffer, GeneralBufferSize)) { return FALSE; } @@ -763,7 +773,7 @@ // load the data debug(LOG_WZ, "levLoadData: Loading %s ...", psBaseData->apDataFiles[i]); if (!resLoad(psBaseData->apDataFiles[i], i, - DisplayBuffer, displayBufferSize)) + GeneralBuffer, GeneralBufferSize)) { return FALSE; } @@ -1013,7 +1023,7 @@ // load the data debug(LOG_WZ, "levLoadData: Loading %s", psNewLevel->apDataFiles[i]); if (!resLoad(psNewLevel->apDataFiles[i], i + CURRENT_DATAID, - DisplayBuffer, displayBufferSize)) + GeneralBuffer, GeneralBufferSize)) { return FALSE; } Index: src/multiint.c =================================================================== --- src/multiint.c (revision 1628) +++ src/multiint.c (working copy) @@ -225,8 +225,8 @@ strcpy(aFileName,psLevel->apDataFiles[0]); aFileName[strlen(aFileName)-4] = '\0'; strcat(aFileName, "/ttypes.ttp"); - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug(LOG_NEVER, "loadMapPreview: Failed to load terrain types file"); return; @@ -244,8 +244,8 @@ ptr = strrchr(aFileName, '/'); ASSERT(ptr, "this string was supposed to contain a /"); strcpy(ptr, "/game.map"); - pFileData = DisplayBuffer; - if (!loadFileToBuffer(aFileName, pFileData, displayBufferSize, &fileSize)) + pFileData = GeneralBuffer; + if (!loadFileToBuffer(aFileName, pFileData, GeneralBufferSize, &fileSize)) { debug(LOG_NEVER, "loadMapPreview: Failed to load map file"); return; Index: src/multilimit.c =================================================================== --- src/multilimit.c (revision 1628) +++ src/multilimit.c (working copy) @@ -118,12 +118,12 @@ { initLoadingScreen( TRUE );//changed by jeremy mar8 - if (!resLoad("wrf/piestats.wrf", 501, DisplayBuffer, displayBufferSize)) + if (!resLoad("wrf/piestats.wrf", 501, GeneralBuffer, GeneralBufferSize)) { return FALSE; } - if (!resLoad("wrf/forcedit2.wrf", 502, DisplayBuffer, displayBufferSize)) + if (!resLoad("wrf/forcedit2.wrf", 502, GeneralBuffer, GeneralBufferSize)) { return FALSE; } Index: src/seqdisp.c =================================================================== --- src/seqdisp.c (revision 1628) +++ src/seqdisp.c (working copy) @@ -882,12 +882,12 @@ } FindClose(fileHandle); */ - if (loadFileToBufferNoError(aTextName, DisplayBuffer, displayBufferSize, &fileSize) == FALSE) //Did I mention this is lame? -Q + if (loadFileToBufferNoError(aTextName, GeneralBuffer, GeneralBufferSize, &fileSize) == FALSE) //Did I mention this is lame? -Q { return FALSE; } - pTextBuffer = DisplayBuffer; + pTextBuffer = GeneralBuffer; pCurrentLine = strtok(pTextBuffer,seps); while(pCurrentLine != NULL) {