[Scummvm-cvs-logs] CVS: scummvm/saga scene.cpp,1.5,1.6 scene.h,1.3,1.4 scene_mod.h,1.3,1.4
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat May 1 06:49:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10315
Modified Files:
scene.cpp scene.h scene_mod.h
Log Message:
indent
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scene.cpp 1 May 2004 09:37:12 -0000 1.5
+++ scene.cpp 1 May 2004 13:48:01 -0000 1.6
@@ -20,21 +20,13 @@
* $Header$
*
*/
-/*
- Description:
-
- Scene management module
- Notes:
-*/
+// Scene management module
[...1110 lines suppressed...]
-
- return;
}
-void CF_sceneinfo(int argc, char *argv[])
-{
-
+void CF_sceneinfo(int argc, char *argv[]) {
const char *fmt = "%-20s %d";
YS_IGNORE_PARAM(argc);
@@ -1152,8 +851,6 @@
CON_Print(fmt, "Scene script:", SceneModule.desc.scene_scriptnum);
CON_Print(fmt, "Start script:", SceneModule.desc.start_scriptnum);
CON_Print(fmt, "Music R#", SceneModule.desc.music_rn);
-
- return;
}
} // End of namespace Saga
Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scene.h 30 Apr 2004 23:02:23 -0000 1.3
+++ scene.h 1 May 2004 13:48:01 -0000 1.4
@@ -20,13 +20,8 @@
* $Header$
*
*/
-/*
- Description:
-
- Scene management module private header file
- Notes:
-*/
+// Scene management module private header file
#ifndef SAGA_SCENE_H
#define SAGA_SCENE_H
@@ -34,21 +29,18 @@
namespace Saga {
enum SCENE_LOAD_FLAGS {
-
BY_RESOURCE = 0,
BY_SCENE,
BY_DESC
};
enum SCENE_PROC_PARAMS {
-
SCENE_BEGIN = 0,
SCENE_END
};
-/* Resource type numbers */
+// Resource type numbers
enum SAGA_RESOURCE_TYPES {
-
SAGA_BG_IMAGE = 2,
SAGA_BG_MASK = 3,
SAGA_OBJECT_NAME_LIST = 5,
@@ -70,19 +62,15 @@
#define SAGA_RESLIST_ENTRY_LEN 4
struct R_SCENE_RESLIST {
-
uint32 res_number;
int res_type;
-
byte *res_data;
size_t res_data_len;
-
};
#define SAGA_SCENE_DESC_LEN 16
struct R_SCENE_DESC {
-
int unknown0;
int res_list_rn;
int end_slope;
@@ -91,139 +79,94 @@
int scene_scriptnum;
int start_scriptnum;
int music_rn;
-
R_SCENE_RESLIST *res_list;
size_t res_list_ct;
-
};
struct SCENE_IMAGE {
-
int loaded;
-
int w;
int h;
int p;
-
byte *buf;
size_t buf_len;
-
byte *res_buf;
size_t res_len;
-
PALENTRY pal[256];
-
};
struct SCENE_ANIMINFO {
-
int anim_res_number;
int anim_handle;
-
SCENE_ANIMINFO *next;
-
};
struct R_SCENE_QUEUE {
-
uint32 scene_n;
R_SCENE_DESC *scene_desc;
int load_flag;
-
R_SCENE_PROC *scene_proc;
int scene_skiptarget;
-
};
struct R_SCENE_MODULE {
-
int init;
-
R_RSCFILE_CONTEXT *scene_ctxt;
-
int *scene_lut;
int scene_count;
int scene_max;
-
YS_DL_LIST *scene_queue;
-
int first_scene;
-
int scene_loaded;
int scene_mode;
int scene_number;
int scene_rn;
int in_game;
-
int load_desc;
R_SCENE_DESC desc;
-
int reslist_loaded;
int reslist_entries;
R_SCENE_RESLIST *reslist;
-
int anim_entries;
YS_DL_LIST *anim_list;
-
R_SCENE_PROC *scene_proc;
-
R_TEXTLIST *text_list;
-
SCENE_IMAGE bg;
SCENE_IMAGE bg_mask;
-
};
int SCENE_Queue(R_SCENE_QUEUE * scene_queue);
int SCENE_ClearQueue(void);
-int
-SCENE_Load(int scene,
- int load_flag, R_SCENE_PROC scene_proc, R_SCENE_DESC *);
-
+int SCENE_Load(int scene, int load_flag, R_SCENE_PROC scene_proc, R_SCENE_DESC *);
int LoadSceneDescriptor(uint32 res_number);
-
int LoadSceneResourceList(uint32 res_number);
-
-int ProcessSceneResources(void);
-
+int ProcessSceneResources();
void CF_scenechange(int argc, char *argv[]);
-
void CF_sceneinfo(int argc, char *argv[]);
-/*
- * r_sceneproc.c
-\*--------------------------------------------------------------------------*/
-
-int IHNM_StartProc(void);
-
-int InitialSceneProc(int param, R_SCENE_INFO * scene_info);
-int DefaultSceneProc(int param, R_SCENE_INFO * scene_info);
+int IHNM_StartProc();
-/*
- * r_ite_introproc.c
-\*--------------------------------------------------------------------------*/
+int InitialSceneProc(int param, R_SCENE_INFO *scene_info);
+int DefaultSceneProc(int param, R_SCENE_INFO *scene_info);
-int ITE_StartProc(void);
-int ITE_IntroAnimProc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroCave1Proc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroCave2Proc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroCave3Proc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroCave4Proc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroValleyProc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroTreeHouseProc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroFairePathProc(int param, R_SCENE_INFO * scene_info);
-int ITE_IntroFaireTentProc(int param, R_SCENE_INFO * scene_info);
+int ITE_StartProc();
+int ITE_IntroAnimProc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroCave1Proc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroCave2Proc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroCave3Proc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroCave4Proc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroValleyProc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroTreeHouseProc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroFairePathProc(int param, R_SCENE_INFO *scene_info);
+int ITE_IntroFaireTentProc(int param, R_SCENE_INFO *scene_info);
-/*
- * r_ihnm_introproc.c
-\*--------------------------------------------------------------------------*/
-int IHNM_StartProc(void);
-int IHNM_IntroMovieProc1(int param, R_SCENE_INFO * scene_info);
-int IHNM_IntroMovieProc2(int param, R_SCENE_INFO * scene_info);
-int IHNM_IntroMovieProc3(int param, R_SCENE_INFO * scene_info);
-int IHNM_HateProc(int param, R_SCENE_INFO * scene_info);
+int IHNM_StartProc();
+int IHNM_IntroMovieProc1(int param, R_SCENE_INFO *scene_info);
+int IHNM_IntroMovieProc2(int param, R_SCENE_INFO *scene_info);
+int IHNM_IntroMovieProc3(int param, R_SCENE_INFO *scene_info);
+int IHNM_HateProc(int param, R_SCENE_INFO *scene_info);
} // End of namespace Saga
-#endif /* SAGA_SCENE_H_ */
+#endif
Index: scene_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene_mod.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scene_mod.h 30 Apr 2004 23:02:23 -0000 1.3
+++ scene_mod.h 1 May 2004 13:48:01 -0000 1.4
@@ -20,13 +20,8 @@
* $Header$
*
*/
-/*
- Description:
-
- Scene management module public header file
- Notes:
-*/
+// Scene management module public header file
#ifndef SAGA_SCENE_MOD_H__
#define SAGA_SCENE_MOD_H__
@@ -35,69 +30,52 @@
namespace Saga {
-/*
- * r_scene.c
-\*--------------------------------------------------------------------------*/
enum R_SCENE_MODES {
-
R_SCENE_MODE_INVALID,
R_SCENE_MODE_NORMAL,
R_SCENE_MODE_ISO
};
struct SCENE_ZINFO {
-
int begin_slope;
int end_slope;
};
struct SCENE_BGINFO {
-
int bg_x;
int bg_y;
-
int bg_w;
int bg_h;
int bg_p;
-
byte *bg_buf;
size_t bg_buflen;
-
};
struct R_SCENE_INFO {
-
SCENE_ZINFO z_info;
SCENE_BGINFO bg_info;
-
R_TEXTLIST *text_list;
-
};
typedef int (R_SCENE_PROC) (int, R_SCENE_INFO *);
-int SCENE_Register(void);
-int SCENE_Init(void);
-int SCENE_Shutdown(void);
-
-int SCENE_Start(void);
-int SCENE_Next(void);
-int SCENE_Skip(void);
-int SCENE_End(void);
-
+int SCENE_Register();
+int SCENE_Init();
+int SCENE_Shutdown();
+int SCENE_Start();
+int SCENE_Next();
+int SCENE_Skip();
+int SCENE_End();
int SCENE_Draw(R_SURFACE *);
-
-int SCENE_GetMode(void);
-int SCENE_GetBGMaskInfo(int *w, int *h, byte ** buf, size_t * buf_len);
-
+int SCENE_GetMode();
+int SCENE_GetBGMaskInfo(int *w, int *h, byte **buf, size_t *buf_len);
int SCENE_IsBGMaskPresent(void);
-int SCENE_GetBGInfo(SCENE_BGINFO * bginfo);
-int SCENE_GetZInfo(SCENE_ZINFO * zinfo);
-int SCENE_GetBGPal(PALENTRY ** pal);
-
-int SCENE_GetInfo(R_SCENE_INFO * si);
+int SCENE_GetBGInfo(SCENE_BGINFO *bginfo);
+int SCENE_GetZInfo(SCENE_ZINFO *zinfo);
+int SCENE_GetBGPal(PALENTRY **pal);
+int SCENE_GetInfo(R_SCENE_INFO *si);
} // End of namespace Saga
-#endif /* SAGA_SCENE_MOD_H__ */
+#endif
More information about the Scummvm-git-logs
mailing list