LILLIPUT: Merge of Lilliput Engine #1142

Joefish · 2018-03-18T21:47:39Z

This PR adds support for 'The Adventures of Robin Hood' by Millenium Interactive.
The game is in a playable state but input handling / engine structure needs some more love
as it is still quite laggy. Also audio is not working yet.
Despite those shortcomings, its core, the scripting engine seems to be completely reversed
and implemented. Also during my play testing I haven't had any issues except those
aforementioned. I must add that I haven't played it through as I'm not that familiar with the
game yet (and the controls are quite frustrating) so there may be problems I am not aware of.
@Strangerke may be able to correct me and go into more details.

Tested on Linux 4.15.7-1-ARCH
Playtest video (7a978b6)

Looking forward to your suggestions :)

sev-

Solid engine, just a few comments. Great work. Is practically ready for the merge.

sev- · 2018-03-18T22:59:28Z

engines/robin/robin.cpp

+	if (_numCharactersToDisplay <= 1)
+		return;
+
+	for (int var4 = _numCharactersToDisplay - 1; var4 > 0; var4--) {


why not use the standard qsort() here?

sev- · 2018-03-19T09:56:39Z

engines/robin/robin.cpp

+	}
+
+	if (25 - _scriptHandler->_heroismLevel != 0) {
+//		sub16064(23, 25 - _scriptHandler->_byte15FFA);


Is this a todo? and the same call above.

sev- · 2018-03-19T09:59:58Z

engines/robin/script.cpp

+	int var2 = _currScript->readUint16LE();
+	int var3 = _currScript->readUint16LE();
+
+	byte* mapPtr = getMapPtr(var1);


sev- · 2018-03-19T10:02:30Z

engines/robin/script.cpp

+}
+
+void RobinScript::OC_setByte18823() {
+	debugC(1, kDebugS


This is a noop. Should be x = CLIP(x, 0, 56). Check other cases too.

sev- · 2018-03-19T10:03:44Z

engines/robin/script.h

+	kCodeEntered = 6
+};
+
+enum KValueType {


should be kValueType

Joefish · 2018-03-19T14:59:31Z

Thanks for your comments @sev- I will look into it.

bonki · 2018-03-19T15:54:36Z

engines/lilliput/script.cpp

+void LilliputScript::decodePackedText(char *buf) {
+	debugC(2, kDebugScript, "decodePackedText(buf)");
+
+	// All the languages use the English dictionnary


bonki · 2018-03-19T16:10:23Z

Are savegames not supported yet?

bonki · 2018-03-19T16:19:28Z

engines/lilliput/script.cpp

+		if (val == 0xFFF6) // end of script
+			return;
+
+		bool hasIf = false;


hasIf is unused - is this intentional?

bonki · 2018-03-19T16:23:28Z

engines/lilliput/script.cpp

+	case 0xF8: {
+		int index = curWord & 0xFF;
+		assert((index >= 0) && (index < 40));
+		str = Common::String::format("_vm->_rulesBuffer12Pos3[%d]", index);


Looks like a break is missing here. If this fallthrough really is intentional it should be marked as such with // fall through.

dreammaster · 2018-03-19T16:31:14Z

Nice work on updating the history. Just a minor overlook.. the header file defines should ideally be updated as well from names like ROBIN_CONSOLE_H to use LILLIPUT_ instead

…r termination check

… for the help)

bonki · 2018-03-19T22:36:03Z

engines/lilliput/lilliput.h

+}
+
+/**
+ * This is the namespace of the Robin engine.


s/Robin/Lilliput/

i30817 · 2018-03-20T02:05:53Z

These two games (ROME AD&92 and Robin) are great candidates for wider resolutions - maybe including a saner viewport than a oblique square too - and better pathfinding. Wouldn't say no to be able to queue up at least one action during pause mode (to talk/look/steal/murder running characters). Can't wait.

bgK · 2018-03-20T05:05:06Z

engines/lilliput/detection.cpp

+	pattern += "-??.SAV";
+
+	filenames = saveFileMan->listSavefiles(pattern);
+	sort(filenames.begin(), filenames.end());   // Sort (hopefully ensuring we are sorted numerically..)


Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator()); can now be used so replace hope with certainty.

bgK · 2018-03-20T05:05:10Z

engines/lilliput/detection.cpp

+	Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+	Common::StringArray filenames;
+	Common::String pattern = target;
+	pattern += "-??.SAV";


Since this has been written, # has been added to match specifically numbers.

bgK · 2018-03-20T19:03:31Z

engines/lilliput/lilliput.cpp

+			_lastKeyPressed = event;
+			int nextIndex = (_keyboard_nextIndex + 1) % 8;
+			if (_keyboard_oldIndex != nextIndex) {
+				_


Setting the seed to a fixed value will make the random source always return the same sequence.

EDIT: If someone else is wondering, this regards line 2847. For some reason the preview points to the wrong piece of code.

This ensures that the save files are sorted numerically instead of 'hoping' for it.

Joefish · 2018-03-20T19:26:18Z

Thanks for the feedback everyone!

@i30817 This would be something we can take a look at once the base is adequarely stable, but definitely worth exploring later.
@bonki It seems save game support was partially implemented (or maybe even working at one point in the past) but right now it does not.
@dreammaster Actually I had it written down on my TODO list but somehow slippeed my mind.. Fixed it already though :)

dreammaster · 2018-03-22T00:17:54Z

Another minor thing.. is there any particular reason a "_shouldQuit" variable is being set up and used in lilliput.cpp? It would seem easier not to bother with it, and simply use the base engine shouldQuit() method instead

sev- · 2018-03-28T15:36:43Z

It is time to merge it and continue work in-tree.

rsn8887 · 2018-03-28T18:18:43Z

This has some narrowing conversions from int to char, and causes PSP2 build to fail:
http://buildbot.scummvm.org/builders/master-psp2/builds/2354/steps/compile/logs/stdio/text

Can this be fixed by someone who knows the engine, changing those char to uint8 or some such? Thanks!

sev- approved these changes Mar 19, 2018

View reviewed changes

Joefish force-pushed the merge_robin branch from 138465a to 1fc4ccd Compare March 19, 2018 14:56

Joefish changed the title ~~ROBIN: Merge of Engine for 'The Adventures of Robin Hood'~~ LILLIPUT: Merge of Lilliput Engine Mar 19, 2018

bonki reviewed Mar 19, 2018

View reviewed changes

Strangerke added 21 commits March 19, 2018 20:40

LILLIPUT: Add skeletton

d3e0e47

LILLIPUT: Add resource loading

511d7f4

LILLIPUT: Add detection for French, German and Italian versions

283abf8

LILLIPUT: Add a script handler skeletton. All opcodes are stubbed

c95f99e

LILLIPUT: Start implementing some functions

8628358

LILLIPUT: Implement OC_sub184F5, modify struct18560

69de292

LILLIPUT: Fix a couple of bugs in handleOpcode()

512ee79

LILLIPUT: Implement a couple of other opcodes, add proper debugc

2031854

LILLIPUT: Implement some more opcodes

ebf54a5

LILLIPUT: Implement 4 more opcodes

69e44e5

LILLIPUT: Complete function getValue2()

1dbb8e6

LILLIPUT: Implement some more opcodes, fix stupid bug in script parse…

1eaf3c0

…r termination check

LILLIPUT: Add default palette, and palette fixup (thanks to SylvainTV…

86cc23b

… for the help)

LILLIPUT: Partially implement displayVGAFile(). Title is now displayed

8eecd03

LILLIPUT: Add preliminar mouse handler

34ec4ad

LILLIPUT: Modify event polling

5d5ac9a

LILLIPUT: Fix a bug in VGA file loading

f0c6f93

LILLIPUT: Add preliminar menu support and main loop

1bbe3a1

LILLIPUT: Start game scripts

d876857

LILLIPUT: Implement opcodes used by game scripts 3 and 4

8d51e0a

LILLIPUT: Implement opcodes. 29 groups are now executed in a row

9378579

Joefish force-pushed the merge_robin branch from 1fc4ccd to 2fc14f8 Compare March 19, 2018 21:16

LILLIPUT: Fix bug in OC_scrollViewPort

60588a3

bonki reviewed Mar 19, 2018

View reviewed changes

engines/lilliput/lilliput.h Outdated

}

/**

* This is the namespace of the Robin engine.

Copy link

Member

bonki Mar 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/Robin/Lilliput/

Strangerke added 2 commits March 19, 2018 23:41

LILLIPUT: Fix a couple of remaining 'Robin' engine strings

1ff6bbc

LILLIPUT: Fix missing break in getArgumentString

8ac03c6

bgK reviewed Mar 20, 2018

View reviewed changes

Strangerke and others added 5 commits March 20, 2018 09:50

LILLIPUT: Some renaming

b96dc06

LILLIPUT: Fixes formatting

2a97f63

LILLIPUT: Changes KValueType to kValueType

8ffa51d

LILLIPUT: Fixes typo

cdb48e8

LILLIPUT: Reformats string

1bc485a

bgK reviewed Mar 20, 2018

View reviewed changes

Joefish added 2 commits March 20, 2018 20:10

LILLIPUT: Updates savefile pattern for numeric wildcard

4397da0

LILLIPUT: Sorts SaveStateList instead of file names

7b88282

This ensures that the save files are sorted numerically instead of 'hoping' for it.

Strangerke added 4 commits March 21, 2018 08:01

LILLIPUT: More renaming

b468b74

LILLUPUT: Add missing kActionType values

5e2f723

LILLIPUT: More renaming

2303cca

LILLIPUT: Silent some CppCheck warnings

91e54f9

Strangerke added 6 commits March 22, 2018 23:30

LILLIPUT: Some more renaming

585c215

LILLIPUT: More renaming

46b62c0

LILLIPUT: Rename some more opcodes

247b5ba

LILLIPUT: Some more renaming

990cb0c

LILLIPUT: Some more renaming, use CLIP in OC_scrollAwayFromCharacter

12a9607

LILLIPUT: more renaming and refactoring

3a58b47

sev- merged commit 74ce6af into scummvm:master Mar 28, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LILLIPUT: Merge of Lilliput Engine #1142

LILLIPUT: Merge of Lilliput Engine #1142

Joefish commented Mar 18, 2018 •

edited

sev- left a comment

sev- Mar 18, 2018

sev- Mar 19, 2018

sev- Mar 19, 2018

sev- Mar 19, 2018

sev- Mar 19, 2018

Joefish commented Mar 19, 2018

bonki Mar 19, 2018

bonki commented Mar 19, 2018

bonki Mar 19, 2018

bonki Mar 19, 2018

dreammaster commented Mar 19, 2018

bonki Mar 19, 2018

i30817 commented Mar 20, 2018 •

edited

bgK Mar 20, 2018

bgK Mar 20, 2018

bgK Mar 20, 2018

bonki Mar 20, 2018

Joefish commented Mar 20, 2018

dreammaster commented Mar 22, 2018

sev- commented Mar 28, 2018

rsn8887 commented Mar 28, 2018

LILLIPUT: Merge of Lilliput Engine #1142

LILLIPUT: Merge of Lilliput Engine #1142

Conversation

Joefish commented Mar 18, 2018 • edited

sev- left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Joefish commented Mar 19, 2018

Choose a reason for hiding this comment

bonki commented Mar 19, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dreammaster commented Mar 19, 2018

Choose a reason for hiding this comment

i30817 commented Mar 20, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Joefish commented Mar 20, 2018

dreammaster commented Mar 22, 2018

sev- commented Mar 28, 2018

rsn8887 commented Mar 28, 2018

Joefish commented Mar 18, 2018 •

edited

i30817 commented Mar 20, 2018 •

edited