Skip to content

Commit

Permalink
Removed support for small tiles
Browse files Browse the repository at this point in the history
  • Loading branch information
gwathlobal committed Mar 24, 2017
1 parent abb033e commit 334a4c4
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
34 changes: 17 additions & 17 deletions .gitattributes
@@ -1,17 +1,17 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
# Auto detect text files and perform LF normalization
#* text=auto

# Custom for Visual Studio
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
4 changes: 2 additions & 2 deletions CHANGELOG.txt
Expand Up @@ -2,9 +2,9 @@ CHANGELOG

- The 3rd dimension was added to the map! Buildings now have several floors, mobs can go up and down the slopes.
- Gravity added! You can step off the ledges and fall down. You can drop one Z level without any consequences but any distance greater than that and you will take increasing falling damage.
- Mobs will now reconize gravity and will short-cut off the ledges if they see they won't take any damage without finding the nearest slope down.
- Mobs will now recognize the gravity and will short-cut off the ledges if they see they won't take any damage without finding the nearest slope down.
- Added mansions to the building types.
- test CRLF
- Removed support of small tiles.

--------------------
Mar 6, 2017 v1.0.8
Expand Down
5 changes: 3 additions & 2 deletions src/ai.lisp
Expand Up @@ -135,7 +135,7 @@

(defmethod ai-function ((mob mob))
;(declare (optimize (speed 3)))
(logger (format nil "~%AI-Function Computer ~A [~A]~%" (name mob) (id mob)))
(logger (format nil "~%AI-Function Computer ~A [~A] (~A ~A ~A)~%" (name mob) (id mob) (x mob) (y mob) (z mob)))

;; skip and invoke the master AI
(when (master-mob-id mob)
Expand Down Expand Up @@ -644,7 +644,8 @@
(bt:with-lock-held ((path-lock *world*))
(if (and (< (cur-mob-path *world*) (length (mob-id-list (level *world*)))) (not (made-turn *player*)))
(progn
(when (and (not (dead= (get-mob-by-id (cur-mob-path *world*))))
(when (and (not (eq *player* (get-mob-by-id (cur-mob-path *world*))))
(not (dead= (get-mob-by-id (cur-mob-path *world*))))
(not (path (get-mob-by-id (cur-mob-path *world*)))))
(logger (format nil "~%THREAD: Mob ~A [~A] calculates paths~%" (name (get-mob-by-id (cur-mob-path *world*))) (id (get-mob-by-id (cur-mob-path *world*)))) stream)
(let* ((mob (get-mob-by-id (cur-mob-path *world*)))
Expand Down
1 change: 0 additions & 1 deletion src/cotd.lisp
Expand Up @@ -251,7 +251,6 @@
;; set parameters depending on options
;; tiles
(cond
((equal (options-tiles *options*) 'small) (setf *glyph-w* 10 *glyph-h* 10 tiles-path "data/font_small.bmp"))
(t (setf *glyph-w* 15 *glyph-h* 15 tiles-path "data/font_large.bmp")))
;; font
(cond
Expand Down
Binary file removed src/data/font_small.bmp
Binary file not shown.
Binary file removed src/data/font_small_src.png
Binary file not shown.

0 comments on commit 334a4c4

Please sign in to comment.