Commit e6f9d8a1 authored by David O'Toole's avatar David O'Toole

fix compile error

parent f8793cbc
......@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<!-- 2017-04-05 Wed 11:51 -->
<!-- 2017-04-05 Wed 16:27 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>The game of Squareball</title>
......@@ -357,7 +357,7 @@ for the JavaScript code in this tag.
</li>
<li><a href="#org5fbc7be">Player robots</a>
<ul>
<li><a href="#org72fa9b0">Properties</a></li>
<li><a href="#org2f90461">Properties</a></li>
<li><a href="#orga78f7de">Utilities</a></li>
<li><a href="#orgc5faa6b">Kicking the Squareball</a></li>
<li><a href="#org29bc0ce">Friction modification</a></li>
......@@ -417,7 +417,7 @@ for the JavaScript code in this tag.
<li><a href="#org4bbae53">Building the Arena buffer</a>
<ul>
<li><a href="#orga0483d0">A border around the playfield</a></li>
<li><a href="#org2f90461">Properties</a></li>
<li><a href="#orge9805a9">Properties</a></li>
<li><a href="#org234d62d">Updating timers</a></li>
<li><a href="#org3d7bed4">Adding keybindings</a></li>
<li><a href="#org9e18cdd">Populating the board with objects</a></li>
......@@ -1585,9 +1585,9 @@ startup.
<div id="outline-container-org5fbc7be" class="outline-2">
<h2 id="org5fbc7be">Player robots</h2>
<div class="outline-text-2" id="text-org5fbc7be">
</div><div id="outline-container-org72fa9b0" class="outline-3">
<h3 id="org72fa9b0">Properties</h3>
<div class="outline-text-3" id="text-org72fa9b0">
</div><div id="outline-container-org2f90461" class="outline-3">
<h3 id="org2f90461">Properties</h3>
<div class="outline-text-3" id="text-org2f90461">
<div class="org-src-container">
<pre class="src src-lisp">(<span style="color: #f47321;">defparameter</span> <span style="color: #da70d6;">*max-speed*</span> 2.4)
(<span style="color: #f47321;">defparameter</span> <span style="color: #da70d6;">*max-carry-speed*</span> 2.3)
......@@ -2645,9 +2645,9 @@ Pathfinding for Player 1 is turned off.
</div>
</div>
<div id="outline-container-org2f90461" class="outline-3">
<h3 id="org2f90461">Properties</h3>
<div class="outline-text-3" id="text-org2f90461">
<div id="outline-container-orge9805a9" class="outline-3">
<h3 id="orge9805a9">Properties</h3>
<div class="outline-text-3" id="text-orge9805a9">
<div class="org-src-container">
<pre class="src src-lisp">(<span style="color: #f47321;">defclass</span> <span style="color: #83a525;">arena</span> (xelf:buffer)
((resetting <span style="color: #db7093;">:initform</span> nil)
......@@ -2950,7 +2950,7 @@ See also <a href="dictionary/DRAW-STRING.html">DRAW-STRING</a>.
<pre class="src src-lisp">(<span style="color: #f47321;">defparameter</span> <span style="color: #da70d6;">*button-time*</span> 30)
(<span style="color: #f47321;">defparameter</span> <span style="color: #da70d6;">*ready-time*</span> 120)
(<span style="color: #f47321;">define-buffer</span> setup
(<span style="color: #f47321;">defclass</span> <span style="color: #83a525;">setup</span> (buffer)
(timer <span style="color: #db7093;">:initform</span> 0)
(player <span style="color: #db7093;">:initform</span> 1)
(background-color <span style="color: #db7093;">:initform</span> <span style="color: #8b7d7b;">"CornflowerBlue"</span>))
......@@ -3420,7 +3420,7 @@ These strings are segregated here for easier localization and editing.
</div>
<div id="postamble" class="status">
<p class="author">Author: David O'Toole</p>
<p class="date">Created: 2017-04-05 Wed 11:51</p>
<p class="date">Created: 2017-04-05 Wed 16:27</p>
<p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
</div>
</body>
......
......@@ -2012,22 +2012,22 @@ See also [[file:dictionary/DRAW-STRING.html][DRAW-STRING]].
** A special buffer for displaying text
#+begin_src lisp
(defparameter *button-time* 30)
(defparameter *ready-time* 120)
(defparameter *button-time* 30)
(defparameter *ready-time* 120)
(define-buffer setup
(timer :initform 0)
(player :initform 1)
(background-color :initform "CornflowerBlue"))
(defclass setup (buffer)
((timer :initform 0)
(player :initform 1)
(background-color :initform "CornflowerBlue")))
(defmethod update :after ((setup setup))
(with-slots (timer player) setup
(when (plusp timer)
(decf timer))
(when (and (zerop timer)
(null player))
(stop setup)
(do-reset))))
(defmethod update :after ((setup setup))
(with-slots (timer player) setup
(when (plusp timer)
(decf timer))
(when (and (zerop timer)
(null player))
(stop setup)
(do-reset))))
#+end_src
** Arena command for opening the setup screen
......
This diff is collapsed.
......@@ -197,6 +197,7 @@
*window-title*
*windows*
*x11-color-data*
*xelf-version*
+30fps+
+60fps+
+flag+
......
......@@ -191,13 +191,4 @@ See also `define-prototype'.
;;; Clipboard
(defvar *clipboard* nil)
(defun initialize-clipboard-maybe (&optional force)
(when (or force (null *clipboard*))
(setf *clipboard* (make-instance 'buffer))))
(defun clear-clipboard ()
(initialize-clipboard-maybe :force))
;;; prototypes.lisp ends here
......@@ -1378,10 +1378,10 @@ directory included with this application.
(defparameter *button-time* 30)
(defparameter *ready-time* 120)
(define-buffer setup
(timer :initform 0)
(player :initform 1)
(background-color :initform "CornflowerBlue"))
(defclass setup (buffer)
((timer :initform 0)
(player :initform 1)
(background-color :initform "CornflowerBlue")))
(defmethod update :after ((setup setup))
(with-slots (timer player) setup
......
......@@ -36,8 +36,8 @@
;; (:file "buffers" :depends-on ("blocks"))
;;(:file "path" :depends-on ("xelf"))
;; (:file "command" :depends-on ("path"))
(:file "prototypes" :depends-on ("xelf"))
(:file "upnp" :depends-on ("prototypes"))
;; (:file "prototypes" :depends-on ("xelf"))
(:file "upnp" :depends-on ("xelf"))
(:file "netplay" :depends-on ("upnp"))))
(in-package :xelf)
(defvar *xelf-version* "4.8")
(defvar *author* nil "Name of the application author.")
(defvar *author-contact* "URL or email address of application author.")
......@@ -6154,6 +6156,15 @@ goal."
(:active *active-indicator-color*)
(:inactive *inactive-indicator-color*))))))
(defvar *clipboard* nil)
(defun initialize-clipboard-maybe (&optional force)
(when (or force (null *clipboard*))
(setf *clipboard* (make-instance 'buffer))))
(defun clear-clipboard ()
(initialize-clipboard-maybe :force))
(defun bind-event-to-text-insertion (self key mods text)
(bind-event-to-task self key mods
(new 'task :insert-string self (list text))))
......
......@@ -41,7 +41,7 @@ This program and its documentation are works in progress, and many
source sections need documentation. These are marked with red TODO
tags.
* Xelf package
* Lisp package
Here we declare the rest of this file to be in the Xelf package. The
actual package definition is stored in the accompanying file
......@@ -51,6 +51,12 @@ actual package definition is stored in the accompanying file
(in-package :xelf)
#+end_src
* Xelf version string
#+begin_src lisp
(defvar *xelf-version* "4.8")
#+end_src
* Copyright notices
Your game or application should show a copyright notice for your own
......@@ -7237,6 +7243,19 @@ above.
(:inactive *inactive-indicator-color*))))))
#+end_src
** Clipboard
#+begin_src lisp
(defvar *clipboard* nil)
(defun initialize-clipboard-maybe (&optional force)
(when (or force (null *clipboard*))
(setf *clipboard* (make-instance 'buffer))))
(defun clear-clipboard ()
(initialize-clipboard-maybe :force))
#+end_src
** Text keybindings
#+begin_src lisp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment