# HG changeset patch
# User unC0Rr
# Date 1693926128 -7200
# Node ID 72c71c38557958f4e777221d7465cf70c1414638
# Parent 96d0e6149d3d866b4edc66d6d7b1af40a4b4ae57# Parent 20adaa1276635315417e36e2adda43c1c0e85a4f
Merge default
diff -r 96d0e6149d3d -r 72c71c385579 misc/flags_js.xhtml
--- a/misc/flags_js.xhtml Tue Sep 05 17:01:46 2023 +0200
+++ b/misc/flags_js.xhtml Tue Sep 05 17:02:08 2023 +0200
@@ -56,8 +56,8 @@
<script type="application/ecmascript">
//<![CDATA[
"use strict";
-var IS_LOCAL=false; // set to true to fetch flags locally. Useful for testing.
-var flags;
+let IS_LOCAL=false; // set to true to fetch flags locally. Useful for testing.
+let flags;
if (IS_LOCAL) {
/* JavaScript version of a sprite sheet - this could be pretty trivially done in pure HTML, but maintenance
would be easier with a server-side portion. list of sprites could be gotten from server, but would require XSS whitelisting */
@@ -98,11 +98,11 @@
flags = [];
}
-var on_xml_loaded = function(ex)
+let on_xml_loaded = function(ex)
{
- var resp = this.responseText;
- var r = />([^<]*).png</g;
- var x;
+ let resp = this.responseText;
+ let r = />([^<]*).png</g;
+ let x;
while(x = r.exec(resp))
{
flags.push(x[1]);
@@ -110,21 +110,21 @@
on_flags_loaded();
}
-var on_xml_error = function()
+let on_xml_error = function()
{
- var p = document.createElement("p");
+ let p = document.createElement("p");
p.appendChild(document.createTextNode("ERROR: List of flags could not be fetched from the server!"));
document.body.appendChild(p);
}
-var on_flags_loaded;
+let on_flags_loaded;
window.onload = function()
{
// Load list of flags
if (!IS_LOCAL) {
// Request list of flags from repository URL
- var xml=new XMLHttpRequest();
+ let xml=new XMLHttpRequest();
xml.open("GET", "//hg.hedgewars.org/hedgewars/file/tip/share/hedgewars/Data/Graphics/Flags/");
xml.addEventListener("error", on_xml_error);
xml.onload = on_xml_loaded;
@@ -139,41 +139,45 @@
on_flags_loaded = function()
{
// Sort flags
- var flag_compare = function(a, b)
+ let flag_compare = function(a, b)
{
if (a === "hedgewars")
- return false;
+ return -1;
else if (b === "hedgewars")
- return true;
+ return 1;
else if (a.startsWith("cm_") && !b.startsWith("cm_"))
- return true;
+ return 1;
else if (!a.startsWith("cm_") && b.startsWith("cm_"))
- return false;
+ return -1;
+ else if (a > b)
+ return 1;
+ else if (a < b)
+ return -1;
else
- return a > b;
+ return 0;
}
flags.sort(flag_compare);
// Render flags
- var img;
- var j = 0;
- var toDelete = [];
- var a = document.createElement("a");
+ let img;
+ let j = 0;
+ let toDelete = [];
+ let a = document.createElement("a");
a.className="flag";
a.appendChild(document.createElement("div"));
a.lastChild.appendChild(document.createTextNode(""));
- var flagState = 0; // 0 = hedgewars, 1 = country flag, 2 = community flag ("cm_")
+ let flagState = 0; // 0 = hedgewars, 1 = country flag, 2 = community flag ("cm_")
- for (var i=0;i<flags.length;i++)
+ for (let i=0;i<flags.length;i++)
{
- var flag = flags[i];
+ let flag = flags[i];
// Skip CPU flags
if (flag === "cpu" || flag === "cpu_plain")
continue;
- var oldFlagState = flagState;
+ let oldFlagState = flagState;
if (flagState === 0 && flag !== "hedgewars")
flagState++;
else if (flagState === 1 && flag.startsWith("cm_"))
@@ -186,7 +190,7 @@
document.body.appendChild(document.createElement("br"));
}
- var h = document.body.appendChild(a.cloneNode(true));
+ let h = document.body.appendChild(a.cloneNode(true));
if (IS_LOCAL)
h.href = "../share/hedgewars/Data/Graphics/Flags/"+flag+".png";
else
@@ -194,7 +198,7 @@
img = new Image();
img.onload = function() {
- var name = this.id.substr(7);
+ let name = this.id.substr(7);
if (this.height === 32) {
staticMasks[name] = true;
}
@@ -204,7 +208,6 @@
img.id = "__flag_"+flag;
h.lastChild.style.backgroundImage = 'url("'+h.href+'")';
- h.lastChild.lastChild.data = flag;
h.title = flag;
if (j%17 === 16 || i === flags.length-1)
diff -r 96d0e6149d3d -r 72c71c385579 misc/graves_js_anim.xhtml
--- a/misc/graves_js_anim.xhtml Tue Sep 05 17:01:46 2023 +0200
+++ b/misc/graves_js_anim.xhtml Tue Sep 05 17:02:08 2023 +0200
@@ -61,8 +61,8 @@
</style>
<script type="application/ecmascript">
//<![CDATA[
-var IS_LOCAL=false; // set to true to fetch graves locally. Useful for testing.
-var graves;
+let IS_LOCAL=false; // set to true to fetch flags locally. Useful for testing.
+let graves;
if (IS_LOCAL) {
/* JavaScript version of a sprite sheet - this could be pretty trivially done in pure HTML, but maintenance
would be easier with a server-side portion. list of sprites could be gotten from server, but would require XSS whitelisting */
@@ -78,7 +78,7 @@
graves = [];
}
-var themes = {
+let themes = {
// Last updated: 1.0.0
"Art":1,
"Beach":1,
@@ -113,14 +113,14 @@
"Snow":1,
"Stage":1,
"Underwater":1};
-var girder;
-var animationInterval;
+let girder;
+let animationInterval;
on_xml_loaded = function(ex)
{
- var resp = this.responseText;
- var r = />([^<]*).png</g;
- var x;
+ let resp = this.responseText;
+ let r = />([^<]*).png</g;
+ let x;
while(x = r.exec(resp))
{
graves.push(x[1]);
@@ -130,7 +130,7 @@
on_xml_error = function()
{
- var p = document.createElement("p");
+ let p = document.createElement("p");
p.appendChild(document.createTextNode("ERROR: List of graves could not be fetched from the server!"));
document.body.appendChild(p);
}
@@ -140,7 +140,7 @@
// Load list of graves
if (!IS_LOCAL) {
// Request list of graves from repository URL
- var xml=new XMLHttpRequest();
+ let xml=new XMLHttpRequest();
xml.open("GET", "//hg.hedgewars.org/hedgewars/file/tip/share/hedgewars/Data/Graphics/Graves/");
xml.addEventListener("error", on_xml_error);
xml.onload = on_xml_loaded;
@@ -155,35 +155,34 @@
on_graves_loaded = function()
{
// Render girders
- var s = document.styleSheets[0].cssRules;
- for(var i=0;i<s.length;i++)
+ let s = document.styleSheets[0].cssRules;
+ for(let i=0;i<s.length;i++)
{
if (s[i].selectorText.toLowerCase() === ".girder")
girder = s[i];
}
- var a = document.createElement("a");
- var g = document.createElement("div");
+ let a = document.createElement("a");
+ let g = document.createElement("div");
g.className="girder";
a.className="grave";
a.appendChild(document.createElement("div"));
a.lastChild.appendChild(document.createTextNode(""));
// Render graves
- var missingGraves = [];
- var img;
- var j = 0;
- var toDelete = [];
- for (var i=0;i<graves.length;i++)
+ let missingGraves = [];
+ let img;
+ let j = 0;
+ let toDelete = [];
+ for (let i=0;i<graves.length;i++)
{
- var h = document.body.appendChild(a.cloneNode(true));
+ let h = document.body.appendChild(a.cloneNode(true));
if (IS_LOCAL)
h.href = "../share/hedgewars/Data/Graphics/Graves/"+graves[i]+".png";
else
h.href = "//hg.hedgewars.org/hedgewars/raw-file/tip/share/hedgewars/Data/Graphics/Graves/"+graves[i]+".png";
h.lastChild.style.backgroundImage = 'url("'+h.href+'")';
- h.lastChild.lastChild.data = graves[i];
h.title = graves[i];
h.idle = Math.floor(Math.random()*16);
if (j%8 === 7 || i === graves.length-1)
@@ -195,20 +194,20 @@
animationInterval = setInterval(animateGraves, 128);
// Theme selection drop-down list
- var form = document.body.appendChild(document.createElement("form"));
+ let form = document.body.appendChild(document.createElement("form"));
- var opt = document.createElement("option");
+ let opt = document.createElement("option");
opt.appendChild(document.createTextNode(""));
- var label = document.createElement("label");
+ let label = document.createElement("label");
label.htmlFor = "theme_select";
label.appendChild(document.createTextNode("Theme: "));
form.appendChild(label);
- var sel = form.appendChild(document.createElement("select"));
+ let sel = form.appendChild(document.createElement("select"));
sel.id = "theme_select";
sel.onchange = switchTheme;
- for(var theme in themes)
+ for(let theme in themes)
{
sel.appendChild(opt.cloneNode(true));
sel.lastChild.value = theme;
@@ -219,7 +218,7 @@
form.appendChild(document.createElement("br"));
// Checkbox: Switch animation
- var chk = document.createElement("input");
+ let chk = document.createElement("input");
chk.id = "anim";
chk.type = "checkbox";
chk.onclick = switchAnim;
@@ -227,7 +226,7 @@
form.appendChild(chk);
label = document.createElement("label");
label.htmlFor = "anim";
- label.appendChild(document.createTextNode("Animate graves"));
+ label.appendChild(document.createTextNode(" Animate graves"));
form.appendChild(label);
form.appendChild(document.createElement("br"));
@@ -241,24 +240,24 @@
form.appendChild(chk);
label = document.createElement("label");
label.htmlFor = "hide_girders";
- label.appendChild(document.createTextNode("Show girders"));
+ label.appendChild(document.createTextNode(" Show girders"));
form.appendChild(label);
document.body.appendChild(form);
-
+ switchTheme();
}
function animateGraves()
{
- var a = document.getElementsByTagName("a");
- for (var i=0;i<a.length;i++)
+ let a = document.getElementsByTagName("a");
+ for (let i=0;i<a.length;i++)
{
if (a[i].className !== "grave")
continue;
// Cycle thru animation frames
- var maskName = a[i].title;
+ let maskName = a[i].title;
// Grave
a[i].firstChild.style.backgroundPosition=Math.floor(a[i].idle/16)*-32+"px "+(a[i].idle%16)*-32+"px";
@@ -283,8 +282,8 @@
// Turn on or off girders
function hideGirders()
{
- var g = document.getElementsByClassName("girder");
- for(var i=0;i<g.length;i++)
+ let g = document.getElementsByClassName("girder");
+ for(let i=0;i<g.length;i++)
if (this.checked)
g[i].className = "girder";
else
@@ -295,14 +294,15 @@
// Select theme according to drop-down list value
function switchTheme()
{
- var prefix;
+ let prefix;
if (!IS_LOCAL)
prefix = "//hg.hedgewars.org/hedgewars/raw-file/tip";
else
prefix = "..";
- document.body.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+this.value+'/Sky.png")';
- if (themes[this.value])
- girder.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+this.value+'/Girder.png")';
+ let theme = this.value || "Nature";
+ document.body.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+theme+'/Sky.png")';
+ if (themes[theme])
+ girder.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+theme+'/Girder.png")';
else
girder.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Graphics/Girder.png")';
}
diff -r 96d0e6149d3d -r 72c71c385579 misc/hats_js_anim.xhtml
--- a/misc/hats_js_anim.xhtml Tue Sep 05 17:01:46 2023 +0200
+++ b/misc/hats_js_anim.xhtml Tue Sep 05 17:02:08 2023 +0200
@@ -34,7 +34,7 @@
color: #BFBED0;
text-decoration: none;
}
-.hat
+.hat, .hatLocal
{
margin-top: 12px;
margin-left: 20px;
@@ -42,8 +42,15 @@
height: 32px;
width: 32px;
color: transparent;
+}
+.hat
+{
background-image: url("//hg.hedgewars.org/hedgewars/raw-file/tip/share/hedgewars/Data/Graphics/Hedgehog/Idle.png");
}
+.hatLocal
+{
+ background-image: url("../share/hedgewars/Data/Graphics/Hedgehog/Idle.png");
+}
.girder
{
width: 100%;
@@ -62,8 +69,8 @@
</style>
<script type="application/ecmascript">
//<![CDATA[
-var IS_LOCAL=false; // set to true to fetch hats locally. Useful for testing.
-var masks;
+let IS_LOCAL=false; // set to true to fetch graves locally. Useful for testing.
+let masks;
if (IS_LOCAL) {
/* JavaScript version of a sprite sheet - this could be pretty trivially done in pure HTML, but maintenance
would be easier with a server-side portion. list of sprites could be gotten from server, but would require XSS whitelisting */
@@ -79,7 +86,7 @@
masks = [];
}
-var themes = {
+let themes = {
// Last updated: 1.0.0
"Art":1,
"Beach":1,
@@ -114,16 +121,16 @@
"Snow":1,
"Stage":1,
"Underwater":1};
-var girder;
-var animationInterval;
+let girder;
+let animationInterval;
-var staticMasks = [];
+let staticMasks = [];
on_xml_loaded = function(ex)
{
- var resp = this.responseText;
- var r = />([^<]*).png</g;
- var x;
+ let resp = this.responseText;
+ let r = />([^<]*).png</g;
+ let x;
while(x = r.exec(resp))
{
masks.push(x[1]);
@@ -133,7 +140,7 @@
on_xml_error = function()
{
- var p = document.createElement("p");
+ let p = document.createElement("p");
p.appendChild(document.createTextNode("ERROR: List of hats could not be fetched from the server!"));
document.body.appendChild(p);
}
@@ -143,7 +150,7 @@
// Load list of hats
if (!IS_LOCAL) {
// Request list of hats from repository URL
- var xml=new XMLHttpRequest();
+ let xml=new XMLHttpRequest();
xml.open("GET", "//hg.hedgewars.org/hedgewars/file/tip/share/hedgewars/Data/Graphics/Hats/");
xml.addEventListener("error", on_xml_error);
xml.onload = on_xml_loaded;
@@ -159,7 +166,7 @@
{
// Exclude NoHat as uninteresting. Exclude team hats as we can't properly display them yet
// TODO: Add support for team hats
- var disallowedMasks = {
+ let disallowedMasks = {
"NoHat":true,
"hair_team":true,
"cap_team":true,
@@ -167,33 +174,37 @@
};
// Render girders
- var s = document.styleSheets[0].cssRules;
- for(var i=0;i<s.length;i++)
+ let s = document.styleSheets[0].cssRules;
+ for(let i=0;i<s.length;i++)
{
if (s[i].selectorText.toLowerCase() === ".girder")
girder = s[i];
}
- var a = document.createElement("a");
- var g = document.createElement("div");
+ let a = document.createElement("a");
+ let g = document.createElement("div");
g.className="girder";
- a.className="hat";
+ if (IS_LOCAL) {
+ a.className="hatLocal";
+ } else {
+ a.className="hat";
+ }
a.appendChild(document.createElement("div"));
a.lastChild.appendChild(document.createTextNode(""));
// Render hats
- var missingMasks = [];
- var img;
- var j = 0;
- var toDelete = [];
- for (var i=0;i<masks.length;i++)
+ let missingMasks = [];
+ let img;
+ let j = 0;
+ let toDelete = [];
+ for (let i=0;i<masks.length;i++)
{
if (disallowedMasks[masks[i]] === true) {
missingMasks.push(masks[i]);
toDelete.push(i);
continue;
}
- var h = document.body.appendChild(a.cloneNode(true));
+ let h = document.body.appendChild(a.cloneNode(true));
if (IS_LOCAL)
h.href = "../share/hedgewars/Data/Graphics/Hats/"+masks[i]+".png";
else
@@ -201,7 +212,7 @@
img = new Image();
img.onload = function() {
- var name = this.id.substr(7);
+ let name = this.id.substr(7);
if (this.height === 32) {
staticMasks[name] = true;
}
@@ -211,7 +222,6 @@
img.id = "__mask_"+masks[i];
h.lastChild.style.backgroundImage = 'url("'+h.href+'")';
- h.lastChild.lastChild.data = masks[i];
h.title = masks[i];
h.idle = Math.floor(Math.random()*19);
if (j%17 === 16 || i === masks.length-1)
@@ -219,19 +229,19 @@
j++;
}
// Cleanup masks array
- for (var i=0; i<toDelete.length; i++)
+ for (let i=0; i<toDelete.length; i++)
masks.splice(toDelete[i], 1);
// List missing hats
if (missingMasks.length > 0)
{
- var pm = document.createElement("p");
+ let pm = document.createElement("p");
pm.appendChild(document.createTextNode("Other hats: "));
- for (var i=0; i<missingMasks.length; i++)
+ for (let i=0; i<missingMasks.length; i++)
{
if (missingMasks[i] === "NoHat")
continue;
- var link = document.createElement("a");
+ let link = document.createElement("a");
if (IS_LOCAL)
link.href = "../share/hedgewars/Data/Graphics/Hats/"+missingMasks[i]+".png";
else
@@ -241,6 +251,7 @@
if (i < missingMasks.length -1)
pm.appendChild(document.createTextNode(", "));
}
+ document.body.appendChild(document.createElement("br"));
document.body.appendChild(pm);
}
@@ -248,20 +259,20 @@
animationInterval = setInterval(animateHogs, 128);
// Theme selection drop-down list
- var form = document.body.appendChild(document.createElement("form"));
+ let form = document.body.appendChild(document.createElement("form"));
- var opt = document.createElement("option");
+ let opt = document.createElement("option");
opt.appendChild(document.createTextNode(""));
- var label = document.createElement("label");
+ let label = document.createElement("label");
label.htmlFor = "theme_select";
label.appendChild(document.createTextNode("Theme: "));
form.appendChild(label);
- var sel = form.appendChild(document.createElement("select"));
+ let sel = form.appendChild(document.createElement("select"));
sel.id = "theme_select";
sel.onchange = switchTheme;
- for(var theme in themes)
+ for(let theme in themes)
{
sel.appendChild(opt.cloneNode(true));
sel.lastChild.value = theme;
@@ -272,7 +283,7 @@
form.appendChild(document.createElement("br"));
// Checkbox: Switch animation
- var chk = document.createElement("input");
+ let chk = document.createElement("input");
chk.id = "anim";
chk.type = "checkbox";
chk.onclick = switchAnim;
@@ -280,7 +291,7 @@
form.appendChild(chk);
label = document.createElement("label");
label.htmlFor = "anim";
- label.appendChild(document.createTextNode("Animate hats"));
+ label.appendChild(document.createTextNode(" Animate hats"));
form.appendChild(label);
form.appendChild(document.createElement("br"));
@@ -294,27 +305,27 @@
form.appendChild(chk);
label = document.createElement("label");
label.htmlFor = "hide_girders";
- label.appendChild(document.createTextNode("Show girders"));
+ label.appendChild(document.createTextNode(" Show girders"));
form.appendChild(label);
document.body.appendChild(form);
-
+ switchTheme();
}
function animateHogs()
{
- var a = document.getElementsByTagName("a");
- for (var i=0;i<a.length;i++)
+ let a = document.getElementsByTagName("a");
+ for (let i=0;i<a.length;i++)
{
- if (a[i].className !== "hat")
+ if (a[i].className !== "hat" && a[i].className !== "hatLocal")
continue;
// Cycle through hedgehog and hat animation frames
// Hedgehog
a[i].style.backgroundPosition=Math.floor(a[i].idle/16)*-32+"px "+(a[i].idle%16)*-32+"px";
- var maskName = a[i].title;
+ let maskName = a[i].title;
// Hat
if (staticMasks[maskName] === true) {
// Hat offset for static hats
@@ -354,8 +365,8 @@
// Turn on or off girders
function hideGirders()
{
- var g = document.getElementsByClassName("girder");
- for(var i=0;i<g.length;i++)
+ let g = document.getElementsByClassName("girder");
+ for(let i=0;i<g.length;i++)
if (this.checked)
g[i].className = "girder";
else
@@ -366,14 +377,15 @@
// Select theme according to drop-down list value
function switchTheme()
{
- var prefix;
+ let prefix;
if (!IS_LOCAL)
prefix = "//hg.hedgewars.org/hedgewars/raw-file/tip";
else
prefix = "..";
- document.body.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+this.value+'/Sky.png")';
- if (themes[this.value])
- girder.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+this.value+'/Girder.png")';
+ let theme = this.value || "Nature";
+ document.body.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+theme+'/Sky.png")';
+ if (themes[theme])
+ girder.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Themes/'+theme+'/Girder.png")';
else
girder.style.backgroundImage='url("'+prefix+'/share/hedgewars/Data/Graphics/Girder.png")';
}
diff -r 96d0e6149d3d -r 72c71c385579 tools/pas2c/Pas2C.hs
--- a/tools/pas2c/Pas2C.hs Tue Sep 05 17:01:46 2023 +0200
+++ b/tools/pas2c/Pas2C.hs Tue Sep 05 17:02:08 2023 +0200
@@ -715,6 +715,9 @@
liftM (parens . (<> text " + 1")) $ initExpr2C' e
initExpr2C' (BuiltInFunction "pred" [e]) =
liftM (parens . (<> text " - 1")) $ initExpr2C' e
+initExpr2C' (BuiltInFunction "round" [e]) = do
+ e <- initExpr2C' e
+ return $ text "(int)" <> parens e
initExpr2C' b@(BuiltInFunction _ _) = error $ show b
initExpr2C' (InitTypeCast t' i) = do
e <- initExpr2C i
diff -r 96d0e6149d3d -r 72c71c385579 tools/pas2c/PascalBasics.hs
--- a/tools/pas2c/PascalBasics.hs Tue Sep 05 17:01:46 2023 +0200
+++ b/tools/pas2c/PascalBasics.hs Tue Sep 05 17:02:08 2023 +0200
@@ -17,7 +17,7 @@
string' = void . string
builtin :: [String]
-builtin = ["succ", "pred", "low", "high", "ord", "inc", "dec", "exit", "break", "continue", "length", "copy"]
+builtin = ["succ", "pred", "low", "high", "ord", "inc", "dec", "exit", "break", "continue", "length", "copy", "round"]
pascalLanguageDef :: GenLanguageDef String u Identity
pascalLanguageDef