Imports hode 0.2.8

Author: usineur

3p/inih

@@ -1,3 +1,7 @@
+* release 0.2.8
+	- added PSX background overlays (MDEC)
+	- fixed crash playing paf animation #3 with Italian PC data files
+
 * release 0.2.7
 	- added 'projection' submenu
 	- added PSX backgrounds (MDEC)

CHANGES.txt

@@ -1,6 +1,6 @@
 
 hode README
-Release version: 0.2.7
+Release version: 0.2.8
 -------------------------------------------------------------------------------
 
 
@@ -50,8 +50,7 @@ Status:
 
 Settings submenu is not implemented.
 
-PSX version datafiles can be used but background overlays (MDEC) are not
-decoded and menu is unavailable.
+PSX datafiles can be used, but menu and videos are missing.
 
 
 Credits:

README.txt

@@ -45,6 +45,52 @@
   - rock_hod.mst: 5b49637348f6c6a2737a64cacf01f9bcef8e83f6
   - rock_hod.sss: 55c841f6c091c2ae68f0636c075c66405d00cc6a
   - setup.dat: 1d476d896cafd3d4af00b15eb2eb695a804a0662
+- name: Heart of Darkness Italian (Win32)
+  files:
+  - dark_hod.lvl: e7c188e5c47632d512d96d9da89fc8c060528d45
+  - dark_hod.mst: 6c2d93b2e31c299215d0fdf05ac1e8e8e95e9042
+  - dark_hod.sss: 8d5b19842e551b8ec73bda411c210cc96e08569a
+  - fort_hod.lvl: 82456ed6e29780b5b8031a67ba3dddb8da813c19
+  - fort_hod.mst: ce55095902ade9f1d8a198f271d0946d6228b90d
+  - fort_hod.sss: 6ff572b553d93040c9cad74891db05b2cc8267c6
+  - hod.paf: 0644a8114392b8e9449f691315dd8cb5a8616ac1
+  - hodwin32.exe: 9c61df98e15a265bd5719b7e5e2e2af13644b80e
+    securom: true
+    version_info:
+    - Comments: Release Candidate 0
+    - CompanyName: Amazing Studio - 9 rue d' Enhgien - 75010 Paris FRANCE - Email: hod@amazingstudio.com
+    - FileDescription: Heart Of Darkness
+    - FileVersion: 1, 1, 0, 0
+    - InternalName: Heart Of Darkness
+    - LegalCopyright: (c) 1998 by Amazing Studio & Infogrames
+    - LegalTrademarks: by Amazing Studio - All rights reserved
+    - OriginalFilename: Heart Of Darkness
+    - PrivateBuild: HEARTMM5511
+    - ProductName: Heart Of Darkness  - Windows 95 / 98 & NT - DirectX 3.x or greater
+    - ProductVersion: 1, 1, 0, 0
+    - SpecialBuild: VC5.0 Sp3
+  - isld_hod.lvl: f78e9316f2187c0ca9e42abe8a2242b3d3e6feaf
+  - isld_hod.mst: 448e5dd5bbe59621279562d8695c9a864cb4c286
+  - isld_hod.sss: 61c5da6dfcf80684c56baebddb04125ca0c1f209
+  - lar1_hod.lvl: 84f7b33a9b57f2afa68063e0128512991f86dfa0
+  - lar1_hod.mst: 9db53a4a75327eeca45ffa5b761a9f04af5e5204
+  - lar1_hod.sss: 72667991fde3caf36978da1fa929695de80abe4b
+  - lar2_hod.lvl: 999b2548490f586f955c9f5c6db95f88d49102f3
+  - lar2_hod.mst: 333ea4e6be6ca9aad735fafe59177546aab41c4e
+  - lar2_hod.sss: c5c655b718ead1d2eb460a058df7eb3b795dea9e
+  - lava_hod.lvl: 2921eb2f78354e79c1257ef55543bb1a1492e914
+  - lava_hod.mst: c05ce42c0abdbb2dbfc109cbb4ea7eee1937445d
+  - lava_hod.sss: 8fc8d2c86f67e13ca840d604c603249b20723f85
+  - pwr1_hod.lvl: cd6489e11914770d95034aa6afaa2fc67f035ce8
+  - pwr1_hod.mst: f821e5686ae27b2ed5000ea4b38a464ecebe44a7
+  - pwr1_hod.sss: cbb39e1bfd24dcbd5bf65f9e0b92faaa9b6b02a6
+  - pwr2_hod.lvl: 7263ecf8d51d45c2c62dc11701eac03b67738fd8
+  - pwr2_hod.mst: 132b29e758a28529009e979ef31a29a42d0a5c4b
+  - pwr2_hod.sss: 24342241b4353777cc22696be8a684d635f9c809
+  - rock_hod.lvl: cdb3d7ad1ae13f2234380f79bc8ec57e1e505cef
+  - rock_hod.mst: 5b49637348f6c6a2737a64cacf01f9bcef8e83f6
+  - rock_hod.sss: 55c841f6c091c2ae68f0636c075c66405d00cc6a
+  - setup.dat: 39f310f3586dc5e2f0ff6f81b8ac7257012e933b
 - name: Heart of Darkness Japanese (Win32)
   files:
   - dark_hod.lvl: e7c188e5c47632d512d96d9da89fc8c060528d45
@@ -162,12 +208,16 @@
   - rock_hod.mst: 24dee01526c06b6f003b2c8e22e4d5787df333c8
   - rock_hod.sss: ec683718d26bc1e0b4a254215621dd6c6c3e60b0
   - setup.dat: e6d1ae87b991d3cf623b8ec9fb33cdd2a3d4a1b4
-- name: Heart of Darkness Demo (PSX) SLED_013.51
+- name: Heart of Darkness Demo (PSX)
   files:
   - rock_hod.lvl: 9cbc3bad9efe5f21f66c33d9872e29a1bd7b4c0c
   - rock_hod.mst: e7fbfcde10c08aa64ae1398fc95257891863790b
   - setup.dax: e091dddd74dc00ccf57a48dc8495ed95cde6a42d
-- name: Heart of Darkness (PSX) SLUS_006.96
+  - sled_013.51: 2b51ec92ff067c6099bfa90cb759adebf7979fb5
+    - text_addr: 0x80010000
+    - text_size: 452608
+    - copyright: Sony Computer Entertainment Inc. for Europe area
+- name: Heart of Darkness NTSC-U (PSX)
   files:
   - dark_hod.lvl: f6482575f1d4d2b6aa8910c709681a714edfba6b
   - dark_hod.mst: a97ac13edde17fd33cb06e9907139949c8b79cdb
@@ -188,3 +238,11 @@
   - rock_hod.lvl: 9cbc3bad9efe5f21f66c33d9872e29a1bd7b4c0c
   - rock_hod.mst: e7fbfcde10c08aa64ae1398fc95257891863790b
   - setup.dax: 9d5708b6dedce70a17c76c10ea16f02121826aab
+  - slus_006.96: da1c0a6284345bd64b828e266ef4d6b2eca81f39
+    - text_addr: 0x80010000
+    - text_size: 493568
+    - copyright: Sony Computer Entertainment Inc. for North America area
+  - slus_007.41: da1c0a6284345bd64b828e266ef4d6b2eca81f39
+    - text_addr: 0x80010000
+    - text_size: 493568
+    - copyright: Sony Computer Entertainment Inc. for North America area

RELEASES.yaml

@@ -316,7 +316,8 @@ void Game::setupBackgroundBitmap() {
 		playSound(lvl->backgroundBitmapId, 0, 0, 3);
 	}
 	if (_res->_isPsx) {
-		_video->decodeBackgroundPsx(pic + 2);
+		const int size = Video::W * Video::H * sizeof(uint16_t);
+		_video->decodeBackgroundPsx(pic + 2, size, Video::W, Video::H);
 	} else {
 		decodeLZW(pic, _video->_backgroundLayer);
 	}
@@ -2257,7 +2258,7 @@ LvlObject *Game::updateAnimatedLvlObjectType0(LvlObject *ptr) {
 			ptr->currentSound = 0xFFFF;
 		}
 		if (isPsx) {
-			_video->decodeTilePsx(data);
+			_video->decodeBackgroundOverlayPsx(data);
 		} else {
 			Sprite *spr = _spritesNextPtr;
 			if (spr && READ_LE_UINT16(data + 2) > 8) {
@@ -2324,7 +2325,7 @@ LvlObject *Game::updateAnimatedLvlObjectType0(LvlObject *ptr) {
 		data = vg->currentSpriteData + soundDataLen;
 		if (_res->_currentScreenResourceNum == ptr->screenNum) {
 			if (isPsx) {
-				_video->decodeTilePsx(data);
+				_video->decodeBackgroundOverlayPsx(data);
 			} else {
 				Sprite *spr = _spritesNextPtr;
 				if (spr && READ_LE_UINT16(data + 2) > 8) {

game.cpp

@@ -198,26 +198,24 @@ int main(int argc, char *argv[]) {
 	setupAudio(g);
 	g->loadSetupCfg(resume);
 	bool runGame = true;
+	g->_video->init(isPsx);
 	if (_runMenu && resume && !isPsx) {
 		Menu *m = new Menu(g, g->_paf, g->_res, g->_video);
 		runGame = m->mainLoop();
 		delete m;
 	}
-	if (runGame) {
-		if (isPsx) {
-			g->_video->initPsx();
-		}
+	if (runGame && !g_system->inp.quit) {
 		bool levelChanged = false;
 		do {
 			g->mainLoop(level, checkpoint, levelChanged);
+			// do not save progress when game is started from a specific level/checkpoint
+			if (resume) {
+				g->saveSetupCfg();
+			}
 			level += 1;
 			checkpoint = 0;
 			levelChanged = true;
 		} while (!g_system->inp.quit && level < kLvl_test);
-		// do not save progress when game is started from a specific level/checkpoint
-		if (resume) {
-			g->saveSetupCfg();
-		}
 	}
 	g_system->stopAudio();
 	g->_mix.fini();

main.cpp

@@ -14,8 +14,8 @@ struct BitStream { // most significant 16 bits
 		: _src(src), _bits(0), _len(0), _end(src + size) {
 	}
 
-	bool endOfStream() const {
-		return _src >= _end && _len == 0;
+	int bitsAvailable() const {
+		return (_end - _src) * 8 + _len;
 	}
 
 	int getBits(int count) { // 6 to 16 bits
@@ -32,7 +32,7 @@ struct BitStream { // most significant 16 bits
 	}
 	int getSignedBits(int len) {
 		const int shift = 32 - len;
-		int32_t value = getBits(len);
+		const int32_t value = getBits(len);
 		return (value << shift) >> shift;
 	}
 	bool getBit() {
@@ -54,7 +54,7 @@ static int readDC(BitStream *bs, int version) {
 static void readAC(BitStream *bs, int *coefficients) {
 	int count = 0;
 	int node = 0;
-	while (!bs->endOfStream()) {
+	while (bs->bitsAvailable() > 0) {
 		const uint16_t value = _acHuffTree[node].value;
 		switch (value) {
 		case kAcHuff_EscapeCode: {
@@ -176,14 +176,14 @@ static void decodeBlock(BitStream *bs, int x8, int y8, uint8_t *dst, int dstPitc
 	}
 }
 
-int decodeMDEC(const uint8_t *src, int len, const uint8_t *mborder, int w, int h, MdecOutput *out) {
+int decodeMDEC(const uint8_t *src, int len, const uint8_t *mborder, int mblen, int w, int h, MdecOutput *out) {
 	BitStream bs(src, len);
 	bs.getBits(16);
 	const uint16_t vlc = bs.getBits(16);
 	assert(vlc == 0x3800);
 	const uint16_t qscale = bs.getBits(16);
 	const uint16_t version = bs.getBits(16);
-	// fprintf(stdout, "mdec qscale %d version %d\n", qscale, version);
+	// fprintf(stdout, "mdec qscale %d version %d w %d h %d\n", qscale, version, w, h);
 	assert(version == 2);
 
 	const int blockW = (w + 15) / 16;
@@ -196,24 +196,29 @@ int decodeMDEC(const uint8_t *src, int len, const uint8_t *mborder, int w, int h
 	const int crPitch = out->planes[kOutputPlaneCr].pitch;
 	uint8_t *crPtr = out->planes[kOutputPlaneCr].ptr + out->y / 2 * crPitch + out->x / 2;
 
+	int z = 0;
 	for (int x = 0; x < blockW; ++x) {
 		for (int y = 0; y < blockH; ++y) {
-			if (mborder) {
-				const uint8_t xy = *mborder++;
+			if (z < mblen) {
+				const uint8_t xy = mborder[z];
 				if ((xy & 15) != x || (xy >> 4) != y) {
 					continue;
 				}
+				++z;
 			}
 			decodeBlock(&bs, x, y, crPtr, crPitch, qscale, version);
 			decodeBlock(&bs, x, y, cbPtr, cbPitch, qscale, version);
 			decodeBlock(&bs, 2 * x,     2 * y,     yPtr, yPitch, qscale, version);
 			decodeBlock(&bs, 2 * x + 1, 2 * y,     yPtr, yPitch, qscale, version);
 			decodeBlock(&bs, 2 * x,     2 * y + 1, yPtr, yPitch, qscale, version);
 			decodeBlock(&bs, 2 * x + 1, 2 * y + 1, yPtr, yPitch, qscale, version);
+			if (mborder && z == mblen) {
+				goto end;
+			}
 		}
 	}
-
-	if (!mborder) {
+end:
+	if (!mborder && bs.bitsAvailable() >= 11) {
 		const int eof = bs.getBits(11);
 		assert(eof == 0x3FE); // v2 frame
 	}

mdec.cpp

@@ -19,6 +19,6 @@ struct MdecOutput {
 	} planes[3];
 };
 
-int decodeMDEC(const uint8_t *src, int len, const uint8_t *mborder, int w, int h, MdecOutput *out);
+int decodeMDEC(const uint8_t *src, int len, const uint8_t *mborder, int mblen, int w, int h, MdecOutput *out);
 
 #endif // MDEC_H__