[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.39,1.40 akos.cpp,1.8,1.9 boxes.cpp,1.19,1.20 costume.cpp,1.20,1.21 debug.cpp,1.24,1.25 gfx.cpp,1.52,1.53 gui.cpp,1.19,1.20 insane.cpp,1.7,1.8 object.cpp,1.44,1.45 resource.cpp,1.56,1.57 saveload.cpp,1.33,1.34 script.cpp,1.37,1.38 script_v1.cpp,1.55,1.56 script_v2.cpp,1.35,1.36 scumm.h,1.91,1.92 scummvm.cpp,1.89,1.90 sdl.cpp,1.46,1.47 sound.cpp,1.32,1.33 stdafx.cpp,1.1.1.1,1.2 string.cpp,1.32,1.33 sys.cpp,1.8,1.9 vars.cpp,1.2,1.3 verbs.cpp,1.21,1.22
James Brown
ender at users.sourceforge.net
Wed Mar 20 09:52:05 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.38,1.39 script_v1.cpp,1.54,1.55 scumm.h,1.90,1.91 string.cpp,1.31,1.32
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.7,1.8 gmidi.cpp,1.9,1.10 imuse.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv2484
Modified Files:
actor.cpp akos.cpp boxes.cpp costume.cpp debug.cpp gfx.cpp
gui.cpp insane.cpp object.cpp resource.cpp saveload.cpp
script.cpp script_v1.cpp script_v2.cpp scumm.h scummvm.cpp
sdl.cpp sound.cpp stdafx.cpp string.cpp sys.cpp vars.cpp
verbs.cpp
Log Message:
I know it probably doesn't look like much, but this is a start to the reorg - basically I've shuffled the Scumm struct around, and turned it into a Class - labeling and grouping functions that are related.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** actor.cpp 19 Mar 2002 14:39:02 -0000 1.39
--- actor.cpp 20 Mar 2002 17:51:06 -0000 1.40
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** akos.cpp 6 Mar 2002 12:24:56 -0000 1.8
--- akos.cpp 20 Mar 2002 17:51:06 -0000 1.9
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** boxes.cpp 18 Mar 2002 22:48:57 -0000 1.19
--- boxes.cpp 20 Mar 2002 17:51:06 -0000 1.20
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** costume.cpp 19 Mar 2002 07:59:53 -0000 1.20
--- costume.cpp 20 Mar 2002 17:51:06 -0000 1.21
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** debug.cpp 10 Mar 2002 17:33:02 -0000 1.24
--- debug.cpp 20 Mar 2002 17:51:06 -0000 1.25
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** gfx.cpp 14 Mar 2002 13:57:28 -0000 1.52
--- gfx.cpp 20 Mar 2002 17:51:06 -0000 1.53
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** gui.cpp 18 Mar 2002 12:40:13 -0000 1.19
--- gui.cpp 20 Mar 2002 17:51:06 -0000 1.20
***************
*** 1,4 ****
/* ScummVM - Scumm Interpreter
! * Copyright (C) 2001 The ScummVM project
*
* This program is free software; you can redistribute it and/or
--- 1,5 ----
/* ScummVM - Scumm Interpreter
! * Copyright (C) 2001 Ludvig Strigeus
! * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** insane.cpp 10 Mar 2002 17:33:02 -0000 1.7
--- insane.cpp 20 Mar 2002 17:51:06 -0000 1.8
***************
*** 1,7 ****
! // insane.cpp : Defines the entry point for the console application.
!
! //
!
#if !defined(__APPLE__CW)
--- 1,22 ----
! /* ScummVM - Scumm Interpreter
! * Copyright (C) 2001 Ludvig Strigeus
[...1510 lines suppressed...]
parseTag();
frameIndex++;
if (_paletteChanged) {
_paletteChanged = false;
setPalette();
sm->setDirtyColors(0, 255);
}
blitToScreen(sm,_renderBitmap, 0, 0, 320 ,200);
updateScreen(sm);
waitForTimer(sm,20);
if(sm->_keyPressed == sm->_vars[sm->VAR_CUTSCENEEXIT_KEY])
return;
} while (1);
}
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** object.cpp 16 Mar 2002 18:58:51 -0000 1.44
--- object.cpp 20 Mar 2002 17:51:06 -0000 1.45
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** resource.cpp 18 Mar 2002 22:48:57 -0000 1.56
--- resource.cpp 20 Mar 2002 17:51:06 -0000 1.57
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** saveload.cpp 18 Mar 2002 01:19:16 -0000 1.33
--- saveload.cpp 20 Mar 2002 17:51:06 -0000 1.34
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** script.cpp 18 Mar 2002 11:50:08 -0000 1.37
--- script.cpp 20 Mar 2002 17:51:06 -0000 1.38
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** script_v1.cpp 19 Mar 2002 14:39:02 -0000 1.55
--- script_v1.cpp 20 Mar 2002 17:51:06 -0000 1.56
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** script_v2.cpp 8 Mar 2002 20:57:09 -0000 1.35
--- script_v2.cpp 20 Mar 2002 17:51:06 -0000 1.36
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** scumm.h 19 Mar 2002 14:39:02 -0000 1.91
--- scumm.h 20 Mar 2002 17:51:06 -0000 1.92
***************
*** 35,39 ****
#define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))
! struct Scumm;
struct Actor;
--- 35,39 ----
#define ARRAYSIZE(x) (sizeof(x)/sizeof(x[0]))
! class Scumm;
struct Actor;
[...1736 lines suppressed...]
- int gate1bx, gate1by;
- int gate2ax, gate2ay;
- int gate2bx, gate2by;
-
- int CloX[8];
- int CloY[8];
-
- void walkActorOld(Actor *a);
};
enum AkosOpcodes{
--- 1997,2004 ----
byte VAR_UNK_SCRIPT_2;
byte VAR_DEFAULT_TALK_DELAY;
byte VAR_CHARSET_MASK;
};
+
enum AkosOpcodes{
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** scummvm.cpp 18 Mar 2002 20:04:15 -0000 1.89
--- scummvm.cpp 20 Mar 2002 17:51:06 -0000 1.90
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** sdl.cpp 18 Mar 2002 11:50:09 -0000 1.46
--- sdl.cpp 20 Mar 2002 17:51:06 -0000 1.47
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** sound.cpp 18 Mar 2002 11:50:09 -0000 1.32
--- sound.cpp 20 Mar 2002 17:51:07 -0000 1.33
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: stdafx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/stdafx.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** stdafx.cpp 9 Oct 2001 14:30:13 -0000 1.1.1.1
--- stdafx.cpp 20 Mar 2002 17:51:07 -0000 1.2
***************
*** 1,8 ****
- // stdafx.cpp : source file that includes just the standard includes
- // scummvm.pch will be the pre-compiled header
- // stdafx.obj will contain the pre-compiled type information
-
#include "stdafx.h"
-
- // TODO: reference any additional headers you need in STDAFX.H
- // and not in this file
--- 1 ----
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** string.cpp 19 Mar 2002 14:39:02 -0000 1.32
--- string.cpp 20 Mar 2002 17:51:07 -0000 1.33
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: sys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sys.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sys.cpp 10 Mar 2002 17:33:03 -0000 1.8
--- sys.cpp 20 Mar 2002 17:51:07 -0000 1.9
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/vars.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vars.cpp 6 Mar 2002 10:04:28 -0000 1.2
--- vars.cpp 20 Mar 2002 17:51:07 -0000 1.3
***************
*** 1,2 ****
--- 1,25 ----
+ /* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+
#include "stdafx.h"
#include "scumm.h"
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** verbs.cpp 12 Mar 2002 07:53:45 -0000 1.21
--- verbs.cpp 20 Mar 2002 17:51:07 -0000 1.22
***************
*** 1,4 ****
--- 1,5 ----
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
+ * Copyright (C) 2001/2002 The ScummVM project
*
* This program is free software; you can redistribute it and/or
- Previous message: [Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.38,1.39 script_v1.cpp,1.54,1.55 scumm.h,1.90,1.91 string.cpp,1.31,1.32
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.7,1.8 gmidi.cpp,1.9,1.10 imuse.cpp,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list