[Scummvm-cvs-logs] CVS: scummvm/saga font.cpp,1.14,1.15 font.h,1.6,1.7 sprite.cpp,1.16,1.17
Eugene Sandulenko
sev at users.sourceforge.net
Mon Aug 2 18:13:03 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.21,1.22 actor.h,1.7,1.8 interface.cpp,1.17,1.18 render.cpp,1.26,1.27 render.h,1.13,1.14 saga.cpp,1.38,1.39 saga.h,1.28,1.29 sprite.cpp,1.15,1.16 sprite.h,1.4,1.5 sprite_mod.h,1.2,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound voc.cpp,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15907
Modified Files:
font.cpp font.h sprite.cpp
Log Message:
Rename some class variables in Font class.
Fix compilation.
Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- font.cpp 3 Aug 2004 00:06:18 -0000 1.14
+++ font.cpp 3 Aug 2004 01:12:07 -0000 1.15
@@ -37,22 +37,22 @@
int i;
// Load font module resource context
- if (GAME_GetFileContext(&_font_ctxt,
+ if (GAME_GetFileContext(&_fontContext,
R_GAME_RESOURCEFILE, 0) != R_SUCCESS) {
error("Font::Font(): Couldn't get resource context.");
}
// Allocate font table
- GAME_GetFontInfo(&gamefonts, &_n_fonts);
+ GAME_GetFontInfo(&gamefonts, &_nFonts);
- assert(_n_fonts > 0);
+ assert(_nFonts > 0);
- _fonts = (R_FONT **)malloc(_n_fonts * sizeof *_fonts);
+ _fonts = (R_FONT **)malloc(_nFonts * sizeof *_fonts);
if (_fonts == NULL) {
error("Font::Font(): Memory allocation failure.");
}
- for (i = 0; i < _n_fonts; i++) {
+ for (i = 0; i < _nFonts; i++) {
loadFont(gamefonts[i].font_rn, gamefonts[i].font_id);
}
@@ -91,12 +91,12 @@
int nbits;
int c;
- if ((font_id < 0) || (font_id >= _n_fonts)) {
+ if ((font_id < 0) || (font_id >= _nFonts)) {
return R_FAILURE;
}
// Load font resource
- if (RSC_LoadResource(_font_ctxt, font_rn, &fontres_p, &fontres_len) != R_SUCCESS) {
+ if (RSC_LoadResource(_fontContext, font_rn, &fontres_p, &fontres_len) != R_SUCCESS) {
error("Font::loadFont(): Couldn't load font resource.");
return R_FAILURE;
}
@@ -182,7 +182,7 @@
return R_FAILURE;
}
- if ((font_id < 0) || (font_id >= _n_fonts) || (_fonts[font_id] == NULL)) {
+ if ((font_id < 0) || (font_id >= _nFonts) || (_fonts[font_id] == NULL)) {
error("Font::getHeight(): Invalid font id.");
return R_FAILURE;
}
@@ -348,7 +348,7 @@
return R_FAILURE;
}
- if ((font_id < 0) || (font_id >= _n_fonts) || (_fonts[font_id] == NULL)) {
+ if ((font_id < 0) || (font_id >= _nFonts) || (_fonts[font_id] == NULL)) {
error("Font::getStringWidth(): Invalid font id.");
return R_FAILURE;
}
@@ -383,7 +383,7 @@
return R_FAILURE;
}
- if ((font_id < 0) || (font_id >= _n_fonts) || (_fonts[font_id] == NULL)) {
+ if ((font_id < 0) || (font_id >= _nFonts) || (_fonts[font_id] == NULL)) {
error("Font::draw(): Invalid font id.");
return R_FAILURE;
}
Index: font.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- font.h 3 Aug 2004 00:06:18 -0000 1.6
+++ font.h 3 Aug 2004 01:12:08 -0000 1.7
@@ -117,9 +117,9 @@
SagaEngine *_vm;
bool _initialized;
- R_RSCFILE_CONTEXT *_font_ctxt;
+ R_RSCFILE_CONTEXT *_fontContext;
- int _n_fonts;
+ int _nFonts;
R_FONT **_fonts;
};
Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- sprite.cpp 3 Aug 2004 01:07:34 -0000 1.16
+++ sprite.cpp 3 Aug 2004 01:12:08 -0000 1.17
@@ -32,7 +32,6 @@
#include "saga/text.h"
#include "saga/font.h"
-#include "saga/sprite_mod.h"
#include "saga/sprite.h"
namespace Saga {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.21,1.22 actor.h,1.7,1.8 interface.cpp,1.17,1.18 render.cpp,1.26,1.27 render.h,1.13,1.14 saga.cpp,1.38,1.39 saga.h,1.28,1.29 sprite.cpp,1.15,1.16 sprite.h,1.4,1.5 sprite_mod.h,1.2,NONE
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound voc.cpp,1.19,1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list