Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Game
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
263
Issues
263
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Open RSC
Game
Commits
cd2bd1db
Verified
Commit
cd2bd1db
authored
Jul 10, 2019
by
Marwolf
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Final verification that all Client classes are syncd with Android Client
parent
1a75a054
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
591 additions
and
596 deletions
+591
-596
Android/Open RSC Android Client/src/main/java/com/openrsc/client/entityhandling/defs/NPCDef.java
...n/java/com/openrsc/client/entityhandling/defs/NPCDef.java
+1
-1
Android/Open RSC Android Client/src/main/java/com/openrsc/client/entityhandling/defs/extras/AnimationDef.java
...enrsc/client/entityhandling/defs/extras/AnimationDef.java
+1
-1
Android/Open RSC Android Client/src/main/java/com/openrsc/client/entityhandling/defs/extras/TextureDef.java
...openrsc/client/entityhandling/defs/extras/TextureDef.java
+1
-1
Android/Open RSC Android Client/src/main/java/com/openrsc/data/DataFileDecrypter.java
...ent/src/main/java/com/openrsc/data/DataFileDecrypter.java
+514
-513
Android/Open RSC Android Client/src/main/java/com/openrsc/data/DataFileVariables.java
...ent/src/main/java/com/openrsc/data/DataFileVariables.java
+56
-57
Android/Open RSC Android Client/src/main/java/com/openrsc/data/DataOperations.java
...Client/src/main/java/com/openrsc/data/DataOperations.java
+15
-20
Android/Open RSC Android Client/src/main/java/orsc/Group.java
...oid/Open RSC Android Client/src/main/java/orsc/Group.java
+1
-1
Android/Open RSC Android Client/src/main/java/orsc/MiscFunctions.java
... RSC Android Client/src/main/java/orsc/MiscFunctions.java
+1
-1
client/src/orsc/graphics/two/MudClientGraphics.java
client/src/orsc/graphics/two/MudClientGraphics.java
+1
-1
No files found.
Android/Open RSC Android Client/src/main/java/com/openrsc/client/entityhandling/defs/NPCDef.java
View file @
cd2bd1db
...
...
@@ -127,4 +127,4 @@ public class NPCDef extends EntityDef {
public
boolean
isAttackable
()
{
return
attackable
;
}
}
\ No newline at end of file
}
Android/Open RSC Android Client/src/main/java/com/openrsc/client/entityhandling/defs/extras/AnimationDef.java
View file @
cd2bd1db
...
...
@@ -40,4 +40,4 @@ public class AnimationDef {
public
int
getNumber
()
{
return
number
;
}
}
\ No newline at end of file
}
Android/Open RSC Android Client/src/main/java/com/openrsc/client/entityhandling/defs/extras/TextureDef.java
View file @
cd2bd1db
...
...
@@ -16,4 +16,4 @@ public class TextureDef {
public
String
getAnimationName
()
{
return
animationName
;
}
}
\ No newline at end of file
}
Android/Open RSC Android Client/src/main/java/com/openrsc/data/DataFileDecrypter.java
View file @
cd2bd1db
This diff is collapsed.
Click to expand it.
Android/Open RSC Android Client/src/main/java/com/openrsc/data/DataFileVariables.java
View file @
cd2bd1db
package
com
.
openrsc
.
data
;
class
DataFileVariables
{
DataFileVariables
()
{
anIntArray485
=
new
int
[
256
];
anIntArray487
=
new
int
[
257
];
anIntArray488
=
new
int
[
257
];
aBooleanArray491
=
new
boolean
[
256
];
aBooleanArray492
=
new
boolean
[
16
];
aByteArray493
=
new
byte
[
256
];
aByteArray494
=
new
byte
[
4096
];
anIntArray495
=
new
int
[
16
];
aByteArray496
=
new
byte
[
18002
];
aByteArray497
=
new
byte
[
18002
];
aByteArrayArray498
=
new
byte
[
6
][
258
];
anIntArrayArray499
=
new
int
[
6
][
258
];
anIntArrayArray500
=
new
int
[
6
][
258
];
anIntArrayArray501
=
new
int
[
6
][
258
];
anIntArray502
=
new
int
[
6
];
}
public
class
DataFileVariables
{
public
static
int
anIntArray489
[];
final
int
anInt456
=
4096
;
final
int
anInt457
=
16
;
final
int
anInt458
=
258
;
...
...
@@ -29,43 +12,59 @@ class DataFileVariables {
final
int
anInt462
=
50
;
final
int
anInt463
=
4
;
final
int
anInt464
=
18002
;
byte
aByteArray465
[]
;
int
anInt466
;
int
anInt467
;
int
anInt468
;
int
anInt469
;
byte
aByteArray470
[]
;
int
anInt471
;
int
anInt472
;
int
anInt473
;
int
anInt474
;
byte
aByte475
;
int
anInt476
;
boolean
aBoolean477
;
int
anInt478
;
int
anInt479
;
int
anInt480
;
int
anInt481
;
int
anInt482
;
int
anInt483
;
int
anInt484
;
int
anIntArray485
[]
;
int
anInt486
;
int
anIntArray487
[]
;
public
byte
[]
aByteArray465
;
public
int
anInt466
;
public
int
anInt467
;
public
int
anInt468
;
public
int
anInt469
;
public
byte
[]
aByteArray470
;
public
int
anInt471
;
public
int
anInt472
;
public
int
anInt473
;
public
int
anInt474
;
public
byte
aByte475
;
public
int
anInt476
;
public
boolean
aBoolean477
;
public
int
anInt478
;
public
int
anInt479
;
public
int
anInt480
;
public
int
anInt481
;
public
int
anInt482
;
public
int
anInt483
;
public
int
anInt484
;
public
int
[]
anIntArray485
;
public
int
anInt486
;
public
int
[]
anIntArray487
;
int
anIntArray488
[];
public
static
int
anIntArray489
[];
int
anInt490
;
boolean
aBooleanArray491
[];
boolean
aBooleanArray492
[];
byte
aByteArray493
[];
byte
aByteArray494
[];
int
anIntArray495
[];
byte
aByteArray496
[];
byte
aByteArray497
[];
byte
aByteArrayArray498
[][];
int
anIntArrayArray499
[][];
int
anIntArrayArray500
[][];
int
anIntArrayArray501
[][];
int
anIntArray502
[];
int
anInt503
;
public
int
anInt490
;
public
boolean
[]
aBooleanArray491
;
public
boolean
[]
aBooleanArray492
;
public
byte
[]
aByteArray493
;
public
byte
[]
aByteArray494
;
public
int
[]
anIntArray495
;
public
byte
[]
aByteArray496
;
public
byte
[]
aByteArray497
;
public
byte
[][]
aByteArrayArray498
;
public
int
[][]
anIntArrayArray499
;
public
int
[][]
anIntArrayArray500
;
public
int
[][]
anIntArrayArray501
;
public
int
[]
anIntArray502
;
public
int
anInt503
;
public
DataFileVariables
()
{
anIntArray485
=
new
int
[
256
];
anIntArray487
=
new
int
[
257
];
anIntArray488
=
new
int
[
257
];
aBooleanArray491
=
new
boolean
[
256
];
aBooleanArray492
=
new
boolean
[
16
];
aByteArray493
=
new
byte
[
256
];
aByteArray494
=
new
byte
[
4096
];
anIntArray495
=
new
int
[
16
];
aByteArray496
=
new
byte
[
18002
];
aByteArray497
=
new
byte
[
18002
];
aByteArrayArray498
=
new
byte
[
6
][
258
];
anIntArrayArray499
=
new
int
[
6
][
258
];
anIntArrayArray500
=
new
int
[
6
][
258
];
anIntArrayArray501
=
new
int
[
6
][
258
];
anIntArray502
=
new
int
[
6
];
}
}
Android/Open RSC Android Client/src/main/java/com/openrsc/data/DataOperations.java
View file @
cd2bd1db
package
com
.
openrsc
.
data
;
import
java.io.BufferedInputStream
;
import
java.io.DataInputStream
;
import
java.io.EOFException
;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.*
;
import
java.util.Arrays
;
public
class
DataOperations
{
private
static
final
char
[]
special_characters
=
"~`!@#$%^&*()_-+={}[]|'\";:?><,./"
.
toCharArray
();
private
static
int
baseLengthArray
[]
=
{
0
,
1
,
3
,
7
,
15
,
31
,
63
,
127
,
255
,
511
,
1023
,
2047
,
4095
,
8191
,
16383
,
32767
,
65535
,
0x1ffff
,
0x3ffff
,
0x7ffff
,
0xfffff
,
0x1fffff
,
0x3fffff
,
0x7fffff
,
0xffffff
,
0x1ffffff
,
0x3ffffff
,
0x7ffffff
,
0xfffffff
,
0x1fffffff
,
0x3fffffff
,
0x7fffffff
,
-
1
};
32767
,
65535
,
0x1ffff
,
0x3ffff
,
0x7ffff
,
0xfffff
,
0x1fffff
,
0x3fffff
,
0x7fffff
,
0xffffff
,
0x1ffffff
,
0x3ffffff
,
0x7ffffff
,
0xfffffff
,
0x1fffffff
,
0x3fffffff
,
0x7fffffff
,
-
1
};
static
{
Arrays
.
sort
(
special_characters
);
...
...
@@ -44,17 +39,17 @@ public class DataOperations {
public
static
int
getUnsigned4Bytes
(
byte
abyte0
[],
int
i
)
{
return
((
abyte0
[
i
]
&
0xff
)
<<
24
)
+
((
abyte0
[
i
+
1
]
&
0xff
)
<<
16
)
+
((
abyte0
[
i
+
2
]
&
0xff
)
<<
8
)
+
(
abyte0
[
i
+
3
]
&
0xff
);
+
(
abyte0
[
i
+
3
]
&
0xff
);
}
public
static
long
getUnsigned8Bytes
(
byte
abyte0
[],
int
i
)
{
return
(((
long
)
getUnsigned4Bytes
(
abyte0
,
i
)
&
0xffffffff
L
)
<<
32
)
+
((
long
)
getUnsigned4Bytes
(
abyte0
,
i
+
4
)
&
0xffffffff
L
);
+
((
long
)
getUnsigned4Bytes
(
abyte0
,
i
+
4
)
&
0xffffffff
L
);
}
public
static
int
readInt
(
byte
abyte0
[],
int
i
)
{
return
((
abyte0
[
i
]
&
0xff
)
<<
24
)
|
((
abyte0
[
i
+
1
]
&
0xff
)
<<
16
)
|
((
abyte0
[
i
+
2
]
&
0xff
)
<<
8
)
|
(
abyte0
[
i
+
3
]
&
0xff
);
|
(
abyte0
[
i
+
3
]
&
0xff
);
}
public
static
int
getShort
(
byte
abyte0
[],
int
i
)
{
...
...
@@ -70,7 +65,7 @@ public class DataOperations {
return
abyte0
[
i
];
}
else
{
return
((
abyte0
[
i
]
&
0xff
)
-
128
<<
24
)
+
((
abyte0
[
i
+
1
]
&
0xff
)
<<
16
)
+
((
abyte0
[
i
+
2
]
&
0xff
)
<<
8
)
+
(
abyte0
[
i
+
3
]
&
0xff
);
+
(
abyte0
[
i
+
3
]
&
0xff
);
}
}
...
...
@@ -201,9 +196,9 @@ public class DataOperations {
int
offset
=
2
+
numEntries
*
10
;
for
(
int
entry
=
0
;
entry
<
numEntries
;
entry
++)
{
int
fileHash
=
(
data
[
entry
*
10
+
2
]
&
0xff
)
*
0x1000000
+
(
data
[
entry
*
10
+
3
]
&
0xff
)
*
0x10000
+
(
data
[
entry
*
10
+
4
]
&
0xff
)
*
256
+
(
data
[
entry
*
10
+
5
]
&
0xff
);
+
(
data
[
entry
*
10
+
4
]
&
0xff
)
*
256
+
(
data
[
entry
*
10
+
5
]
&
0xff
);
int
fileSize
=
(
data
[
entry
*
10
+
9
]
&
0xff
)
*
0x10000
+
(
data
[
entry
*
10
+
10
]
&
0xff
)
*
256
+
(
data
[
entry
*
10
+
11
]
&
0xff
);
+
(
data
[
entry
*
10
+
11
]
&
0xff
);
if
(
fileHash
==
wantedHash
)
return
offset
;
offset
+=
fileSize
;
...
...
@@ -222,11 +217,11 @@ public class DataOperations {
int
offset
=
2
+
numEntries
*
10
;
for
(
int
i1
=
0
;
i1
<
numEntries
;
i1
++)
{
int
fileHash
=
(
data
[
i1
*
10
+
2
]
&
0xff
)
*
0x1000000
+
(
data
[
i1
*
10
+
3
]
&
0xff
)
*
0x10000
+
(
data
[
i1
*
10
+
4
]
&
0xff
)
*
256
+
(
data
[
i1
*
10
+
5
]
&
0xff
);
+
(
data
[
i1
*
10
+
4
]
&
0xff
)
*
256
+
(
data
[
i1
*
10
+
5
]
&
0xff
);
int
fileSize
=
(
data
[
i1
*
10
+
6
]
&
0xff
)
*
0x10000
+
(
data
[
i1
*
10
+
7
]
&
0xff
)
*
256
+
(
data
[
i1
*
10
+
8
]
&
0xff
);
+
(
data
[
i1
*
10
+
8
]
&
0xff
);
int
fileSizeCompressed
=
(
data
[
i1
*
10
+
9
]
&
0xff
)
*
0x10000
+
(
data
[
i1
*
10
+
10
]
&
0xff
)
*
256
+
(
data
[
i1
*
10
+
11
]
&
0xff
);
+
(
data
[
i1
*
10
+
11
]
&
0xff
);
if
(
fileHash
==
wantedHash
)
return
fileSize
;
offset
+=
fileSizeCompressed
;
...
...
@@ -248,11 +243,11 @@ public class DataOperations {
int
offset
=
2
+
arc_length
*
10
;
for
(
int
i
=
0
;
i
<
arc_length
;
i
++)
{
int
entry_hash
=
(
arc
[(
i
*
10
+
2
)]
&
0xFF
)
*
16777216
+
(
arc
[(
i
*
10
+
3
)]
&
0xFF
)
*
65536
+
(
arc
[(
i
*
10
+
4
)]
&
0xFF
)
*
256
+
(
arc
[(
i
*
10
+
5
)]
&
0xFF
);
+
(
arc
[(
i
*
10
+
4
)]
&
0xFF
)
*
256
+
(
arc
[(
i
*
10
+
5
)]
&
0xFF
);
int
decmp_len
=
(
arc
[(
i
*
10
+
6
)]
&
0xFF
)
*
65536
+
(
arc
[(
i
*
10
+
7
)]
&
0xFF
)
*
256
+
(
arc
[(
i
*
10
+
8
)]
&
0xFF
);
+
(
arc
[(
i
*
10
+
8
)]
&
0xFF
);
int
cmp_len
=
(
arc
[(
i
*
10
+
9
)]
&
0xFF
)
*
65536
+
(
arc
[(
i
*
10
+
10
)]
&
0xFF
)
*
256
+
(
arc
[(
i
*
10
+
11
)]
&
0xFF
);
+
(
arc
[(
i
*
10
+
11
)]
&
0xFF
);
if
(
entry_hash
==
hash
)
{
if
(
dest
==
null
)
...
...
Android/Open RSC Android Client/src/main/java/orsc/Group.java
View file @
cd2bd1db
...
...
@@ -76,4 +76,4 @@ class Group {
static
String
getStaffPrefix
(
int
groupID
)
{
return
getNameSprite
(
groupID
)
+
getNameColour
(
groupID
);
}
}
\ No newline at end of file
}
Android/Open RSC Android Client/src/main/java/orsc/MiscFunctions.java
View file @
cd2bd1db
...
...
@@ -252,4 +252,4 @@ public final class MiscFunctions {
"b.J("
+
var0
+
','
+
var1
+
','
+
(
var2
!=
null
?
"{...}"
:
"null"
)
+
')'
);
}
}
}
\ No newline at end of file
}
client/src/orsc/graphics/two/MudClientGraphics.java
View file @
cd2bd1db
package
orsc
.
graphics
.
two
;
import
com.openrsc.client.entityhandling.EntityHandler
;
import
com.openrsc.client.entityhandling.defs.SpriteDef
;
import
com.openrsc.client.model.Sprite
;
import
orsc.mudclient
;
import
orsc.util.GenUtil
;
...
...
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