Commit Graph

179 Commits

Author SHA1 Message Date
Nathan Fulton
a01a7fa0cb Initial Android Studio project 2017-10-22 00:53:34 -04:00
Nathan Fulton
f74589c4ce Remove Android project 2017-10-22 00:53:33 -04:00
Nathan Fulton
24eba15f59 Hardware rendering
- Use SDL_Texture and SDL_Render to for DibBitmap and Display operations
- SubBitmap class was created to handle suballocating dibs since the old method required direct pixel access
- Font buffer is no longer used. Back buffer is forced valid and drawn to the screen.
2017-10-22 00:53:33 -04:00
Nathan Fulton
8619337473 Implementation of Color struct 2017-10-22 00:53:33 -04:00
Nathan Fulton
9e7be9055b Use RGB struct for Color 2017-10-22 00:53:33 -04:00
Nathan Fulton
9fa42348a1 needs_credits_symbol.png -> need_credits_symbol.png 2017-10-22 00:53:33 -04:00
Nathan Fulton
c96614a113 Updates to htsdl.xcodeproj 2017-10-22 00:53:33 -04:00
Nathan Fulton
5dc64a3625 Bump game to v1.7 2017-10-22 00:53:33 -04:00
Nathan Fulton
5e927f2ccd SdlAnimSprite update for 32bpp 2017-10-21 20:54:44 -04:00
Nathan Fulton
bda2e4a4ab iOS getPlatformString use SystemName 2017-10-21 20:52:32 -04:00
Nathan Fulton
8b1dda2115 Update SDL display for 32bpp 2017-10-21 20:51:16 -04:00
Nathan Fulton
1a033f9007 Remove HostHelpers cxScreen hack
There used to be a blt bug that would occur when cxScreen was an odd value. Now that SDL API is being used for blt operations, this issue no longer exists.
2017-10-21 20:51:05 -04:00
Nathan Fulton
af52a6755a Android bump NDK_TOOLCHAIN_VERSION to 4.9 2017-10-21 20:48:46 -04:00
Nathan Fulton
25028abab5 Android update SDL2 source symlink
Update symlink for libs dir
2017-10-21 20:48:46 -04:00
Nathan Fulton
0604387d8c Game Android.mk fix paths and link with SDL2_image
- Update paths for libs dir
- Link against SDL2_image
2017-10-21 20:48:27 -04:00
Nathan Fulton
e796d9399b Add Android.mk to for SDL2_image 2017-10-21 20:46:55 -04:00
Nathan Fulton
d6ba6076e0 AndroidLib don't copy htdata832.pdb and htsfx.pdb
In the initial Android port, stdio FILE I/O was being used to read files. However, files in Android assets cannot be read via this method. To hack around this, the data .pdbs were copied out of Android assets into a location where they could be read.
But now the game data read with the host I/O code. The host I/O is code is responsible for ensuring that data can be read from Android assets. Hence, the old .pdb copying hack is no longer necessary.
2017-10-21 20:46:54 -04:00
Nathan Fulton
cc349a6722 Symlink Android SDLActivity.java from libs 2017-10-21 20:46:53 -04:00
Nathan Fulton
f236a8a4a5 Remove Android SDLActivity.java 2017-10-21 20:46:53 -04:00
Nathan Fulton
f2b0fc4136 Add Android assets htdata2432 symlink 2017-10-21 20:46:52 -04:00
Nathan Fulton
dae13feb99 Remove Android assets htdata832.pdb symlink 2017-10-21 20:46:51 -04:00
Nathan Fulton
f61cb69a3b Adjust range of smoke loops
art2432 has more frames in the smoke animations. Hence range for the amount of loops for the animation was decreased.
2017-10-21 20:44:24 -04:00
Nathan Fulton
9cd0c1eca0 Add missing asserts in Simulation::OneTimeInit() 2017-10-21 20:44:23 -04:00
Nathan Fulton
8a872bad5e Update use of FillTo() in ButtonControl::OnPaint() 2017-10-21 20:42:34 -04:00
Nathan Fulton
2105ceff19 Add todo for FancyTextCore 2017-10-21 20:42:33 -04:00
Nathan Fulton
489399dfb4 Rotate miner south west to enter processor
art2432 processor faces more towards the south west compared to the art824 processor which faced basically south. The coordinates used for the fakeMiner animation have been modified to compensate for this and the miner now rotates to the south west before entering.
2017-10-21 20:42:32 -04:00
Nathan Fulton
d64d09c1ad Update hudbar for art2432 2017-10-21 20:42:32 -04:00
Nathan Fulton
467418f089 Help.cpp PaintChunk() use GetColor() 2017-10-21 20:42:31 -04:00
Nathan Fulton
b4e88ab312 SceneryGob::SaveState use Bitmap::GetFileName() 2017-10-21 20:42:30 -04:00
Nathan Fulton
47199e390f FogMap walls.anir -> wall.anir
The animation data for walls in the art2432 repo uses "wall" instead of "walls"
2017-10-21 20:42:29 -04:00
Nathan Fulton
c564578a70 Ecom cache tbm pointer 2017-10-21 20:42:28 -04:00
Nathan Fulton
3ed85e5813 Game::ClearDisplay() null check gaclrFixed
gaclrFixed may be null if a game database is not found. Calling
GetColor() in this case may result in a crash.
2017-10-21 20:42:27 -04:00
Nathan Fulton
05f1755637 Add max FPS to game options 2017-10-21 20:41:49 -04:00
Nathan Fulton
7932f4cc00 Implement FPS cap 2017-10-21 20:41:48 -04:00
Nathan Fulton
aa342e4b7f virtual GetIdleCountdown()
GetIdleCountdown() is now virtual as art2432 needs certain units to have different idle countdowns
2017-10-21 20:41:47 -04:00
Nathan Fulton
278aecfb70 Show walls on mini-map 2017-10-21 20:41:46 -04:00
Nathan Fulton
8d2da3075c Read RGBA mini-map data 2017-10-21 20:41:45 -04:00
Nathan Fulton
00a92e2f6c Animation read updated anir structure
- StripData count is now dword
- Added chars for bitmap and bitmap2 name
- ibm and ibm2 are now words

acrunch max structure was updated in commit 33420b0970728fde92292c525e588cfbdffd7373
2017-10-21 20:40:28 -04:00
Nathan Fulton
119cf11f08 Add 24bpp color array
Change Color to dword and add gaclr24bpp
2017-10-21 20:40:28 -04:00
Nathan Fulton
57c6e26ce2 Read RGBA TileMap data 2017-10-21 20:40:27 -04:00
Nathan Fulton
9662079334 Implement direction16 for mobile units 2017-10-21 20:40:26 -04:00
Nathan Fulton
3f83856115 Update unit strip indices for art2432 2017-10-21 20:39:58 -04:00
Nathan Fulton
dfc9e088f8 Remove old palette code 2017-10-21 20:39:57 -04:00
Nathan Fulton
dfd1d63d1a gszPrefsFilename prefs.bin -> prefs.json 2017-10-21 20:39:13 -04:00
Nathan Fulton
71dd4eb5b5 Save preferences as json
Preferences have keys as defined in ht.h. These keys can be used to read/write preferences. Preferences are saved in a .json on the disk.
This is much easier to work with than the old presences binary structures as it doesn’t require preference versioning.
2017-10-21 20:36:37 -04:00
Nathan Fulton
122a2d198f Change gnScrollSpeed to float 2017-10-21 20:36:36 -04:00
Nathan Fulton
3ecad7c281 Accept the 2432 data directory 2017-10-21 20:36:35 -04:00
Nathan Fulton
fd31d33274 Android gszMainDataDir = NULL
Using NULL as the main data dir will tell the SDL API (the current host file I/O) to fallthough and read from the .apk assets. This is currently desirable in every existing case.
2017-10-21 20:29:54 -04:00
Nathan Fulton
84b4e0f6ba Implement Android HostHelper code for SdlPackFileReader
Needed for changes SdlPackFileReader changes in commit 61e081be5690202cae1e03d6e6cc89a3e94257b7
2017-10-21 20:28:33 -04:00
Nathan Fulton
6b9241fbc5 Add Android jni method for obtaining the AssetManager 2017-10-21 20:28:33 -04:00