From e388aee8d101e828198c19486fb015baaa4ae6cf Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 9 Apr 2016 14:20:28 +0200 Subject: [PATCH] OLDWEB: More fixes --- compatibility.php | 6 ++--- compatibility_stable.php | 6 ++--- contact.php | 2 +- demos.php | 2 +- docs/specs/aary.php | 9 ++++--- docs/specs/char.php | 7 +++--- docs/specs/glossary.php | 13 +++++----- docs/specs/index.php | 6 ++--- docs/specs/introduction.php | 17 +++++++------- docs/specs/scrp-v5.php | 9 ++++--- docs/specs/scrp-v6.php | 47 ++++++++++++++++++------------------- docs/specs/scrp.php | 11 ++++----- donations.php | 4 ++-- downloads.php | 14 +++++------ faq.php | 4 ++-- include/html.php | 22 ++++++++--------- include/sidebar.php | 6 ++--- index.php | 2 +- links.php | 16 ++++++------- poll/index.php | 2 +- press.php | 2 +- screenshots.php | 2 +- status.php | 10 ++++---- subprojects.php | 28 +++++++++++----------- 24 files changed, 120 insertions(+), 127 deletions(-) diff --git a/compatibility.php b/compatibility.php index f7787ed7..99850214 100644 --- a/compatibility.php +++ b/compatibility.php @@ -24,7 +24,7 @@ if (isset($_GET['details'])) { ?>

Compatibility

-
- Last Updated: + Last Updated:

-

Compatibility

-. The status of these can be found on the CVS Compatibility chart.

- Last Updated: + Last Updated:

- -

-'); sidebar_start(true); - + //display welcome table echo html_round_frame_start("AARY: Arrays and Strings",""); ?>

AARY: Arrays and Strings
- +

Introduction

@@ -83,11 +83,10 @@ special case, where one dimension has size 1.

All material © 2000-2002 David Given, unless where stated otherwise.

- - diff --git a/docs/specs/char.php b/docs/specs/char.php index 25b3fdd7..4caaa1ca 100644 --- a/docs/specs/char.php +++ b/docs/specs/char.php @@ -1,4 +1,4 @@ - CHAR: Character Sets
- +

@@ -96,11 +96,10 @@ Words of data: 00001111 22223333 All material © 2000-2002 David Given, unless where stated otherwise.

- - diff --git a/docs/specs/glossary.php b/docs/specs/glossary.php index b9d58a44..3c338b7b 100644 --- a/docs/specs/glossary.php +++ b/docs/specs/glossary.php @@ -1,4 +1,4 @@ - - +

Glossary
- -

+ +

@@ -49,7 +49,7 @@ resource only refers to SCUMM data blocks.)
named resource
A resource that appears in the SCUMM file's index. Named resources are identified by a tuple of (class, number). The numbers are small integers -counting up from zero. +counting up from zero. Named resources are sometimes referred to as objects, but as these can be easily confused with SCUMM objects it is not recommended. @@ -66,11 +66,10 @@ BEs (big endian). All material © 2000-2002 David Given, unless where stated otherwise.

- - diff --git a/docs/specs/index.php b/docs/specs/index.php index 9c1a7340..0fc9647b 100644 --- a/docs/specs/index.php +++ b/docs/specs/index.php @@ -8,7 +8,7 @@ require($file_root."/include/"."incl.php"); html_header("The inComplete SCUMM Reference Guide", ''); sidebar_start(true); -// add +// add //display welcome table echo html_round_frame_start("The inComplete SCUMM Reference Guide",""); @@ -16,7 +16,7 @@ echo html_round_frame_start("The inComplete SCUMM Reference Guide",""); ?>

The inComplete SCUMM Reference Guide
- +

@@ -37,7 +37,7 @@ echo html_round_frame_start("The inComplete SCUMM Reference Guide",""); All material © 2000-2002 David Given, unless where stated otherwise.

- Introduction
- +

Changes

@@ -93,11 +93,11 @@ or to create your own SCUMM games from scratch.

The information obtained here was almost all obtained by other people. All I have done is to collate it into one place. Among the many who have been -working on the SCUMM file format, Ludvig Strigeus, Jimmi Thøgerson and Peter +working on the SCUMM file format, Ludvig Strigeus, Jimmi Th�gerson and Peter Kelly have performed incredible tasks of reverse-engineering, and I am indebted to them. -

Jimmi Thøgerson and Peter Kelly have developed their own +

Jimmi Th�gerson and Peter Kelly have developed their own SCUMM file browsing and analysis tool called SCUMM Revisited. If you are at all interested in SCUMM files, this is an essential tool. @@ -126,7 +126,7 @@ Fandango.

The full list of games and versions follows. - array('1'), @@ -159,7 +159,7 @@ echo html_frame_tr( html_frame_td("Version"). html_frame_td("Game", 'align="center"'), "color4" - + ); $c = 0; while (list($name,$array) = each($games)) @@ -208,11 +208,10 @@ echo html_frame_end(" "); All material © 2000-2002 David Given, unless where stated otherwise.

- - diff --git a/docs/specs/scrp-v5.php b/docs/specs/scrp-v5.php index e67da967..86f5e2b6 100644 --- a/docs/specs/scrp-v5.php +++ b/docs/specs/scrp-v5.php @@ -1,4 +1,4 @@ -'); sidebar_start(true); -//display welcome table +//display welcome table echo html_round_frame_start("V5 opcode list",""); ?>

V5 opcode list
- +

The following conventions are used in the encoding descriptions. @@ -930,11 +930,10 @@ bit is the parameter bit for script, as usual. All material © 2000-2002 David Given, unless where stated otherwise.

- - diff --git a/docs/specs/scrp-v6.php b/docs/specs/scrp-v6.php index 6b981d10..1e03cd68 100644 --- a/docs/specs/scrp-v6.php +++ b/docs/specs/scrp-v6.php @@ -1,4 +1,4 @@ - - +

V6 opcode list
- -

+ +

The following conventions are used in the encoding descriptions: @@ -101,11 +101,11 @@ This instruction varies considerably according to the form.

Encoding

-load array:
A4 CD arrayp16 +load array:
A4 CD arrayp16 -
define array:
A4 D0 arrayp16 data... +
define array:
A4 D0 arrayp16 data... -
set array:
A4 D4 arrayp16 +
set array:
A4 D4 arrayp16

Stack

@@ -201,7 +201,7 @@ for a more general form.
Writes value to the array whose resource number is pointed to by arrayp at offset ( indexx , indexy ). The array can be a byte or word array; byte when writing to a byte -array, value is truncated. Note that because arrayp +array, value is truncated. Note that because arrayp is encoded as a byte, it can only point to a word variable in the range 0000 to 00FF. Use wordArrayIndexedWrite for a more general form.
@@ -321,7 +321,7 @@ for a more general form.

Stack

( delay : -)

-

Operation

Prevents the current thread from being rescheduled until delay +

Operation

Prevents the current thread from being rescheduled until delay ticks have passed. Deschedules immediately.

@@ -343,7 +343,7 @@ ticks have passed. Deschedules immediately.

Stack

( delay : -)

-

Operation

Prevents the current thread from being rescheduled until delay× 60 +

Operation

Prevents the current thread from being rescheduled until delay� 60 ticks have passed ( delay seconds). Deschedules immediately.

@@ -365,7 +365,7 @@ ticks have passed ( delay seconds). Deschedules immediately.

Stack

( delay : -)

-

Operation

Prevents the current thread from being rescheduled until delay× 3600 +

Operation

Prevents the current thread from being rescheduled until delay� 3600 ticks have passed ( delay minutes). Deschedules immediately.

@@ -422,7 +422,7 @@ What are they?]

A new two-dimensional array is allocated and the resource number is written to arrayp . The new array will have a maximum X index -of maxx and a maximum Y index of maxy (i.e., maxy +of maxx and a maximum Y index of maxy (i.e., maxy is one less than the size).

When allocating an array, if type is C7 then the array will @@ -504,7 +504,7 @@ cause the interpreter to crash.

Encoding

A6

-

Stack

( left , top , right , bottom , colour +

Stack

( left , top , right , bottom , colour : -)

@@ -621,7 +621,7 @@ Tests the top two values on the stack to see if they are equal.
0<bool<$80 :
Freeze all threads that are not marked as unfreezable. -
bool³ $80 :
Freeze all threads, even those that are marked +
bool� $80 :
Freeze all threads, even those that are marked as unfreezable.
Freezing is a nestable operation; a thread which is frozen twice must @@ -646,7 +646,7 @@ be thawed twice before it becomes runnable again.

Stack

( value1  value2  :  bool)

-

Operation

If value1³ value2 , set bool to 1, otherwise +

Operation

If value1� value2 , set bool to 1, otherwise set it to 0

Compares the top two values on the stack. Note the order.
@@ -900,7 +900,7 @@ Compares the top two values on the stack. Note the order.

Stack

( arg1 ,  arg2 ,  arg3 , ...,  argn ,  n ,  value  :  bool )

-

Operation

If value is any of arg1 .. argn , bool +

Operation

If value is any of arg1 .. argn , bool := 1, otherwise bool := 0

Tests to see if value is equal to any of the passed in arguments. @@ -982,9 +982,9 @@ to the current program counter after the instruction has been decoded.

Stack

( bool  : -)

-

Operation

if bool ¹ 0, pc := pc + offset
+

Operation

if bool � 0, pc := pc + offset

-Pops the top value off the stack. If non-zero, then offset +Pops the top value off the stack. If non-zero, then offset is added to the current program counter after the instruction has been decoded.

@@ -1055,7 +1055,7 @@ for true.

Stack

( value1  value2  :  bool)

-

Operation

If value1£ value2 , set bool to 1, otherwise +

Operation

If value1� value2 , set bool to 1, otherwise set it to 0

Compares the top two values on the stack. Note the order.
@@ -1154,7 +1154,7 @@ Compares the top two values on the stack. Note the order.

Stack

( in1  in2  :  out)

-

Operation

out:=in1× in2
+

Operation

out:=in1� in2

Performs a multiplication operation on the stack. Note the order.

@@ -1177,7 +1177,7 @@ Performs a multiplication operation on the stack. Note the order.

Stack

( value1 , value2 : bool )

-

Operation

If value1 ¹ value2 , set bool +

Operation

If value1 � value2 , set bool to 1, otherwise set it to 0

Tests the top two values on the stack to see if they are not equal.
@@ -1238,7 +1238,7 @@ shutting down.

Operation

If index is in the range 0.. n , value  :=  arg[index] ; otherwise value  :=  default .

-Returns the index th argument on the stack. If index +Returns the index th argument on the stack. If index is out of range, default is returned instead. If n is less than the number of entries on the stack, undefined behaviour will result, usually involving the interpreter shutting down.
@@ -2008,11 +2008,10 @@ Tests the value on the stack to see if it compares to zero. All material © 2000-2002 David Given, unless where stated otherwise.

- - diff --git a/docs/specs/scrp.php b/docs/specs/scrp.php index 0211dc50..362678d8 100644 --- a/docs/specs/scrp.php +++ b/docs/specs/scrp.php @@ -1,4 +1,4 @@ - SCRP: Scripts
- +

Introduction

@@ -90,7 +90,7 @@ depending on what is being pointed at. - + @@ -175,7 +175,7 @@ the freezeScripts and freezeUnfreeze opcodes). instructions take a fixed number of parameters and return an optional value. The format is: -

opcode [result] [parameter1] [parameter2]... +

opcode [result] [parameter1] [parameter2]...

The result is a word pointer as usual. The parameters are word LE or byte values depending on the opcode. The meaning of the parameters @@ -230,11 +230,10 @@ and how it is to be initialised. All material © 2000-2002 David Given, unless where stated otherwise.

- - diff --git a/donations.php b/donations.php index dd628cc8..f99e8132 100644 --- a/donations.php +++ b/donations.php @@ -21,7 +21,7 @@ echo html_round_frame_start("ScummVM Donations",""); ?>

Donations

-Donation status last updated:
+Donation status last updated:

ScummVM gladly accepts donations to help us with various expenses. In the interest of public disclosure, this page keeps a running tally of donations and expenses incurred by the project. For privacy and logistic reasons, individual contributors @@ -49,7 +49,7 @@ org). All amounts are expressed in USD.

151413 12…0
001
001 address
00I offset

Current Balance: $65.70 - Snoke Media and Tech Hosting Network! @@ -220,7 +220,7 @@ hosted by Snoke Media and Tech Hosting Network!
  • FLAC
  • libmpeg2: a free MPEG-2 video stream decoder
    • -

    FAQ
    - last updated: + last updated:

    - * */ - + $_trcolor = 0; // Set the current Indent Level @@ -25,7 +25,7 @@ function html_ahref ($label, $url, $extra = "") { $label = stripslashes($label); if (!$label and $url) - { + { if (ereg("@",$url)) { return do_indent(" $url "); @@ -117,13 +117,13 @@ function html_round_frame_start ($title = "", $extra = "") global $file_root; $str = "
    \n"; - + if ($title) { $str .= '
    '; $str .= ''.$title.''; $str .= '
    '."\n"; } - + $str .= "
    \n"; // $str .= '
    '."\n"; @@ -219,12 +219,12 @@ function html_form_input_select ($name, $options, $selected = "") { $str = ''."\n"; @@ -237,7 +237,7 @@ function html_form_input_checkbox ($name, $checked = null) $str = ''."\n"; else $str = ''."\n"; - return $str; + return $str; } function html_form_submit ($value = "") @@ -270,7 +270,7 @@ function html_urlify ($text) { $text = ereg_replace($urlreg, " \\2 ", $text); } - + $emailreg = "([a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+)"; if (ereg($emailreg,$text)) { @@ -280,7 +280,7 @@ function html_urlify ($text) return $text; } -// simple httpd header redirect +// simple httpd header redirect function redirect ($url = ".") { header("Location: ".$url); @@ -308,7 +308,7 @@ function html_header ($title, $extra = "") ScummVM - - -
    -
    - diff --git a/index.php b/index.php index 0f0e8f26..e8afc36c 100644 --- a/index.php +++ b/index.php @@ -103,7 +103,7 @@ echo html_round_frame_start("About ScummVM",""); -

    Links

    - +

    ScummVM Link to us: @@ -50,7 +50,7 @@ function addLinkEntry($name, $url, $desc) { addLinkEntry('GP32 port', 'http://www.distant-earth.co.uk/', 'Information about the GP32 port.'); ?>

    - +

    Unofficial ports

    @@ -60,7 +60,7 @@ function addLinkEntry($name, $url, $desc) {
    - +

    Other classic game engine open source projects

    -

    The following are links to other classic game engine open source projects similar to ScummVM. +

    The following are links to other classic game engine open source projects similar to ScummVM. Know any other classic game projects that should be linked here? Let me know!

    @@ -186,7 +186,7 @@ function addLinkEntry($name, $url, $desc) { "Pentagram is a project aiming to create an Ultima 8 engine for use on modern operating systems."); ?>
    - +

    Technical information about SCUMM

    @@ -221,8 +221,8 @@ GUI frontends for ScummVM. addLinkEntry("ScummAqua", "http://www.d.kth.se/~d00-ogo/ogosoft/scummaqua/", "For Mac OS X."); ?> - - -Linux SCUMM Interpreter, Slashdot, November 3, 2001

    -

    Screenshots

    - -
    +

    Currently we have official in-cvs ports for:

    @@ -67,7 +67,7 @@ a week or so, I'll assume you have abandoned that port.

    Of course, new ports are welcome, if you have ported ScummVM to some new exotic bit of hardware :)

    -
    +

    We are still in negotiations with LucasArts over this, although both of us are hoping to reach some kind of closure very very soon. Obviously, @@ -125,7 +125,7 @@ latest CVS versions and replay older games, to ensure there are no regression bugs.

    -
    +

    Now on to the good news for progress in the last few weeks/months:

    @@ -153,7 +153,7 @@ people won't have to commit all our obscure command-line parameters to memory. The Launcher in particular is going to be a key point of our next release, along with hopefully support for at least The Dig.

    -
    +

    So, what needs work?

    @@ -216,7 +216,7 @@ particular) access to the SMUSH display.

    ScummVM -

    -The ScummVM team occasionally works on various subprojects, separate from the main -ScummVM program. These projects are generally reasonably stagnant and not given a high -priority. Regardless, this page is here to inform you of them, in the vague hope of +The ScummVM team occasionally works on various subprojects, separate from the main +ScummVM program. These projects are generally reasonably stagnant and not given a high +priority. Regardless, this page is here to inform you of them, in the vague hope of attracting more developers to help maintain these side-programs.

    -Please do not ask where you can obtain binaries of these programs. Currently both -subprojects are still in a state only suitable for developers... so if you can't compile +Please do not ask where you can obtain binaries of these programs. Currently both +subprojects are still in a state only suitable for developers... so if you can't compile the code yourself, then these are not really ready for you.

    ScummEx (cvs module 'scummex')

    -ScummEx is a multi-platform SCUMM resource browser, viewer and extractor using the +ScummEx is a multi-platform SCUMM resource browser, viewer and extractor using the wxWindows toolkit.

    -Development on this project is currently stalled. The code-base needs quite some cleanup, +Development on this project is currently stalled. The code-base needs quite some cleanup, and viewers for many resource types still need adding to the code. Patches and volunteers a very welcome...

    You can try compiled engine for Windows:

    -Windows Daily Snapshot (build from CVS HEAD, K Win32 .exe file, last update: ) +Windows Daily Snapshot (build from CVS HEAD, K Win32 .exe file, last update: )

    Residual (cvs module 'residual')

    -Residual is a LUA-powered 3D GRIME clone, designed to run the game Grim Fandango. Why -'Residual'? Because this engine covers games that the main ScummVM application will not -support due to their 3D nature. Also, GRIME is a residue. Yes, we know, it's a bad word +Residual is a LUA-powered 3D GRIME clone, designed to run the game Grim Fandango. Why +'Residual'? Because this engine covers games that the main ScummVM application will not +support due to their 3D nature. Also, GRIME is a residue. Yes, we know, it's a bad word pun.

    -Residual's core is in a fairly decent state, however it is not in full-time development and +Residual's core is in a fairly decent state, however it is not in full-time development and as such is progressing slowly.

    You can try compiled engine for Windows:

    -Windows Daily Snapshot (build from CVS HEAD, K Win32 .exe file, last update: ) -Windows Daily Snapshot (build from CVS HEAD, K Win32 .exe file, last update: ) +
    SDL: We might as well say 'Me'