[Scummvm-cvs-logs] CVS: scummvm/bs2 mem_view.cpp,1.5,1.6 mem_view.h,1.2,1.3
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Sep 16 23:28:11 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv5546
Modified Files:
mem_view.cpp mem_view.h
Log Message:
cleanup
Index: mem_view.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mem_view.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mem_view.cpp 9 Sep 2003 12:45:33 -0000 1.5
+++ mem_view.cpp 17 Sep 2003 06:27:51 -0000 1.6
@@ -17,210 +17,159 @@
* $Header$
*/
-//--------------------------------------------------------------------------------------
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-//#include <windows.h>
-
#include "stdafx.h"
-#include "driver/driver96.h"
#include "build_display.h"
#include "console.h"
#include "debug.h"
-#include "defs.h"
#include "header.h"
-#include "layers.h"
#include "mem_view.h"
#include "memory.h"
#include "resman.h"
#include "sword2.h" // (James11aug97) for CloseGame()
-//--------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------
+// has to be global because a local in Fetch_mem_owner is destroyed on exit
+char buf[50];
-char buf[50]; //has to be global because a local in Fetch_mem_owner is destroyed on exit
-//--------------------------------------------------------------------------------------
-void Console_mem_display(void) //Tony13Aug96
-{
-//
- int pass,found_end,k,j,free=0;
+void Console_mem_display(void) { // Tony13Aug96
+ int pass, found_end, k, j, free = 0;
_standardHeader *file_header;
- int scrolls=0;
- char c;
+ int scrolls = 0;
+ char c;
- char inf[][20]=
- {
- {"M_null "},
- {"M_free "},
- {"M_locked"},
- {"M_float "}
+ char inf[][20] = {
+ { "M_null " },
+ { "M_free " },
+ { "M_locked" },
+ { "M_float " }
};
-
- j=base_mem_block;
- do
- {
-
- if (mem_list[j].uid<65536)
- {
+ j = base_mem_block;
+ do {
+ if (mem_list[j].uid < 65536) {
file_header = (_standardHeader*) res_man.Res_open(mem_list[j].uid);
- res_man.Res_close(mem_list[j].uid); //close immediately so give a true count
+ // close immediately so give a true count
+ res_man.Res_close(mem_list[j].uid);
Zdebug("view %d", mem_list[j].uid);
+ pass = 0;
+ found_end = 0;
- pass=0;
- found_end=0;
-
- for (k=0;k<30;k++)
- {
- if (file_header->name[k]==0)
- { found_end=1;
+ for (k = 0; k < 30; k++) {
+ if (file_header->name[k] == 0) {
+ found_end = 1;
break;
}
- if ( (file_header->name[k]<32)||(file_header->name[k]>'z'))
- pass=1;
-
+ if (file_header->name[k] < ' ' || file_header->name[k] > 'z')
+ pass = 1;
}
- if (file_header->name[0]==0)
- pass=1; //also illegal
-
-
- if ((!pass)&&(found_end)) //&&(file_header->fileType<10))
- Print_to_console("%d %s, size 0x%.5x (%dk %d%%), res %d %s %s, A%d, C%d", j,
- inf[mem_list[j].state],
- mem_list[j].size, mem_list[j].size/1024, (mem_list[j].size*100)/total_free_memory, mem_list[j].uid,
+ if (file_header->name[0] == 0)
+ pass = 1; // also illegal
+ if (!pass && found_end) { // && file_header->fileType < 10)
+ Print_to_console("%d %s, size 0x%.5x (%dk %d%%), res %d %s %s, A%d, C%d",
+ j, inf[mem_list[j].state],
+ mem_list[j].size,
+ mem_list[j].size / 1024,
+ (mem_list[j].size * 100) / total_free_memory,
+ mem_list[j].uid,
res_man.Fetch_cluster(mem_list[j].uid),
file_header->name,
res_man.Fetch_age(mem_list[j].uid),
res_man.Fetch_count(mem_list[j].uid));
-
- else Print_to_console(" %d is an illegal resource", mem_list[j].uid);
-
+ } else
+ Print_to_console(" %d is an illegal resource", mem_list[j].uid);
+ } else {
+ Print_to_console("%d %s, size 0x%.5x (%dk %d%%), %s",
+ j, inf[mem_list[j].state], mem_list[j].size,
+ mem_list[j].size / 1024,
+ (mem_list[j].size * 100) / total_free_memory,
+ Fetch_mem_owner(mem_list[j].uid));
}
- else
- Print_to_console("%d %s, size 0x%.5x (%dk %d%%), %s", j,
- inf[mem_list[j].state],
- mem_list[j].size, mem_list[j].size/1024, (mem_list[j].size*100)/total_free_memory,
- Fetch_mem_owner(mem_list[j].uid) );
-
- if (mem_list[j].state==MEM_free)
- free+=mem_list[j].size;
+ if (mem_list[j].state == MEM_free)
+ free += mem_list[j].size;
- j=mem_list[j].child;
+ j = mem_list[j].child;
scrolls++;
Build_display();
- if (scrolls==18)
- {
+ if (scrolls==18) {
Temp_print_to_console("- Press ESC to stop or any other key to continue");
Build_display();
- do
- {
- // Service windows
+ do {
ServiceWindows();
- }
- while(!KeyWaiting());
+ } while(!KeyWaiting());
ReadKey(&c); //kill the key we just pressed
- if (c==27) //ESC
+ if (c == 27) //ESC
break;
- Clear_console_line(); //clear the Press Esc message ready for the new line
- scrolls=0;
+ // clear the Press Esc message ready for the new line
+ Clear_console_line();
+ scrolls = 0;
}
- }
- while (j!=-1);
+ } while (j != -1);
Scroll_console();
- Print_to_console("(total memory block 0x%.8x %dk %dMB) %d / %d%% free", total_free_memory,
- total_free_memory/1024,
- total_free_memory/(1000*1024),
- free,
- (free*100)/total_free_memory);
-
-
+ Print_to_console("(total memory block 0x%.8x %dk %dMB) %d / %d%% free",
+ total_free_memory, total_free_memory / 1024,
+ total_free_memory / (1000 * 1024), free,
+ (free * 100) / total_free_memory);
}
-//--------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------
-const char *Fetch_mem_owner(uint32 uid) //Tony3June96
-{
- switch(uid)
- {
- case UID_memman:
- return("MEMMAN");
- break;
+const char *Fetch_mem_owner(uint32 uid) { //Tony3June96
+ switch(uid) {
+ case UID_memman:
+ return "MEMMAN";
- case UID_font:
- return("font");
- break;
+ case UID_font:
+ return "font";
- case UID_temp:
- return("temp ram allocation");
- break;
+ case UID_temp:
+ return "temp ram allocation";
- case UID_decompression_buffer:
- return("decompression buffer");
- break;
+ case UID_decompression_buffer:
+ return "decompression buffer";
- case UID_shrink_buffer:
- return("shrink buffer");
- break;
+ case UID_shrink_buffer:
+ return "shrink buffer";
- case UID_con_sprite:
- return("console sprite buffer");
- break;
+ case UID_con_sprite:
+ return "console sprite buffer";
- case UID_text_sprite:
- return("text sprite");
- break;
+ case UID_text_sprite:
+ return "text sprite";
- case UID_walk_anim:
- return("walk anim");
- break;
+ case UID_walk_anim:
+ return "walk anim";
- case UID_savegame_buffer:
- return("savegame buffer");
- break;
+ case UID_savegame_buffer:
+ return "savegame buffer";
default:
sprintf(buf, "<sob> %d?", uid);
- return(buf);
- break;
+ return buf;
}
}
-//--------------------------------------------------------------------------------------
-void Create_mem_string( char *string ) // James (21oct96 updated 4dec96)
-{
- int blockNo = base_mem_block;
- int blocksUsed=0;
- int mem_free=0;
- int mem_locked=0;
- int mem_floating=0;
- int memUsed=0;
- int percent;
-
-
+void Create_mem_string(char *string) { // James (21oct96 updated 4dec96)
+ int blockNo = base_mem_block;
+ int blocksUsed = 0;
+ int mem_free = 0;
+ int mem_locked = 0;
+ int mem_floating = 0;
+ int memUsed = 0;
+ int percent;
- while (blockNo != -1)
- {
- switch (mem_list[blockNo].state)
- {
+ while (blockNo != -1) {
+ switch (mem_list[blockNo].state) {
case MEM_free:
mem_free++;
break;
@@ -242,7 +191,8 @@
percent = (memUsed * 100) / total_free_memory;
- sprintf( string, "locked(%u)+float(%u)+free(%u) = %u/%u blocks (%u%% used)(cur %uk)", mem_locked, mem_floating, mem_free, blocksUsed, MAX_mem_blocks, percent, (res_man.Res_fetch_useage()/1024) );
+ sprintf(string,
+ "locked(%u)+float(%u)+free(%u) = %u/%u blocks (%u%% used)(cur %uk)",
+ mem_locked, mem_floating, mem_free, blocksUsed, MAX_mem_blocks,
+ percent, (res_man.Res_fetch_useage() / 1024));
}
-//--------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------
Index: mem_view.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mem_view.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mem_view.h 28 Jul 2003 02:23:04 -0000 1.2
+++ mem_view.h 17 Sep 2003 06:27:51 -0000 1.3
@@ -20,12 +20,8 @@
#ifndef MEMVIEW_H
#define MEMVIEW_H
-//#include "src\driver96.h"
-
-
-const char *Fetch_mem_owner(uint32 uid);
-void Console_mem_display(void); // Tony (13Aug96)
-void Create_mem_string( char *string ); // James (21oct96 updated 4dec96)
-
+const char *Fetch_mem_owner(uint32 uid);
+void Console_mem_display(void); // Tony (13Aug96)
+void Create_mem_string(char *string); // James (21oct96 updated 4dec96)
#endif
More information about the Scummvm-git-logs
mailing list