Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
openjazz
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PocketInsanity
openjazz
Commits
912e6a55
Commit
912e6a55
authored
Apr 13, 2010
by
anotherguest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change name of animationsetting to animation
parent
2b983990
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
scene.h
src/scene/scene.h
+1
-1
sceneload.cpp
src/scene/sceneload.cpp
+8
-5
No files found.
src/scene/scene.h
View file @
912e6a55
...
@@ -59,7 +59,7 @@ enum {
...
@@ -59,7 +59,7 @@ enum {
ESceneTextLine
=
0x5e
,
ESceneTextLine
=
0x5e
,
ESceneTextVAdjust
=
0x5f
,
ESceneTextVAdjust
=
0x5f
,
ESceneAnimationPlayAndContinue
=
0xA7
,
ESceneAnimationPlayAndContinue
=
0xA7
,
ESceneAnimation
Setting
=
0xA6
,
ESceneAnimation
=
0xA6
,
ESceneTextSetting
=
0xb1
,
ESceneTextSetting
=
0xb1
,
ESceneTextSomething
=
0xd9
,
ESceneTextSomething
=
0xd9
,
ESceneTextShadow
=
0xdb
ESceneTextShadow
=
0xdb
...
...
src/scene/sceneload.cpp
View file @
912e6a55
...
@@ -52,6 +52,7 @@ MX
...
@@ -52,6 +52,7 @@ MX
ST
ST
SL
SL
*/
*/
enum
ANIHeaders
enum
ANIHeaders
{
{
E11AniHeader
=
0x3131
,
// Background/start image
E11AniHeader
=
0x3131
,
// Background/start image
...
@@ -238,7 +239,7 @@ void Scene::loadAni (File *f, int dataIndex) {
...
@@ -238,7 +239,7 @@ void Scene::loadAni (File *f, int dataIndex) {
case
E11AniHeader
:
//11
case
E11AniHeader
:
//11
// Skip back size header, this is read by the surface reader
// Skip back size header, this is read by the surface reader
LOG
(
"PL 11 Background Type"
,
1
);
LOG
(
"PL 11 Background Type"
,
0
);
f
->
seek
(
-
2
,
false
);
f
->
seek
(
-
2
,
false
);
animations
->
background
=
f
->
loadSurface
(
SW
,
SH
);
animations
->
background
=
f
->
loadSurface
(
SW
,
SH
);
...
@@ -249,7 +250,7 @@ void Scene::loadAni (File *f, int dataIndex) {
...
@@ -249,7 +250,7 @@ void Scene::loadAni (File *f, int dataIndex) {
break
;
break
;
case
E1LAniHeader
:
{
case
E1LAniHeader
:
{
LOG
(
"PL 1L Background Type"
,
1
);
LOG
(
"PL 1L Background Type"
,
0
);
unsigned
char
*
pixels
;
unsigned
char
*
pixels
;
pixels
=
new
unsigned
char
[
SW
*
SH
];
pixels
=
new
unsigned
char
[
SW
*
SH
];
memset
(
pixels
,
0
,
SW
*
SH
);
memset
(
pixels
,
0
,
SW
*
SH
);
...
@@ -263,7 +264,8 @@ void Scene::loadAni (File *f, int dataIndex) {
...
@@ -263,7 +264,8 @@ void Scene::loadAni (File *f, int dataIndex) {
case
EFFAniHeader
:
case
EFFAniHeader
:
{
{
//LoadCompacted(size, f);
//LoadCompacted(size, f, (unsigned char*) animations->background->pixels, SW, SH);
}
}
break
;
break
;
...
@@ -272,7 +274,8 @@ void Scene::loadAni (File *f, int dataIndex) {
...
@@ -272,7 +274,8 @@ void Scene::loadAni (File *f, int dataIndex) {
case
ERCAniHeader
:
case
ERCAniHeader
:
case
ERLAniHeader
:
case
ERLAniHeader
:
case
EMXAniHeader
:
case
EMXAniHeader
:
case
ERRAniHeader
:
break
;
case
ERRAniHeader
:
// Rotate.. has zero length info
break
;
break
;
...
@@ -466,7 +469,7 @@ void Scene::loadScripts (File *f) {
...
@@ -466,7 +469,7 @@ void Scene::loadScripts (File *f) {
pages
[
loop
].
stopMusic
=
1
;
pages
[
loop
].
stopMusic
=
1
;
LOG
(
"ESceneStopMusic"
,
1
);
LOG
(
"ESceneStopMusic"
,
1
);
}
break
;
}
break
;
case
ESceneAnimation
Setting
:
case
ESceneAnimation
:
{
{
pages
[
loop
].
animLoops
=
f
->
loadInt
();
pages
[
loop
].
animLoops
=
f
->
loadInt
();
pages
[
loop
].
animSpeed
=
f
->
loadShort
();
pages
[
loop
].
animSpeed
=
f
->
loadShort
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment