Hangman 8086

Merge lp:~carsso/hangman8086/motus-sound into lp:hangman8086

  1. motus-sound
  2. Merge into trunk
Proposed by Germain CARRÉ
Status: Merged
Approved by: Fabien LOISON
Approved revision: 11
Merged at revision: 8
Proposed branch: lp:~carsso/hangman8086/motus-sound
Merge into: lp:hangman8086
Diff against target: 123 lines (+68/-14)
4 files modified
mainfunc.asm (+25/-1)
run_windows.cmd (+2/-0)
sounds.res (+40/-12)
words.res (+1/-1)
To merge this branch: bzr merge lp:~carsso/hangman8086/motus-sound
Reviewer Review Type Date Requested Status
Hangman 8086 Developers Pending
Review via email: mp+64564@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mainfunc.asm'
2--- mainfunc.asm 2011-05-26 14:19:39 +0000
3+++ mainfunc.asm 2011-06-14 15:57:09 +0000
4@@ -135,7 +135,7 @@
5 ;; +------------------------------------+
6 ;; | | \
7 ;; | | |
8-;; | | | Clear
9+;; | | | Clears
10 ;; | Menu/Game/Animation | | that
11 ;; | | | part
12 ;; | | |
13@@ -473,3 +473,27 @@
14 ret
15
16
17+;Args:
18+I2S_INT db 0 ;The number to convert
19+
20+;Returns
21+I2S_STR db "0000"
22+
23+_inttostr:
24+
25+;Backup registers
26+push ax
27+push bx
28+push cx
29+push dx
30+
31+;TODO
32+
33+;Restore registers
34+pop dx
35+pop cx
36+pop bx
37+pop ax
38+
39+ret
40+
41
42=== added file 'run_windows.cmd'
43--- run_windows.cmd 1970-01-01 00:00:00 +0000
44+++ run_windows.cmd 2011-06-14 15:57:09 +0000
45@@ -0,0 +1,2 @@
46+set APP_NAME=HANGMAN.com
47+dosbox -conf -c "ECHO" -c "MOUNT C %cd%" -c "C:" -c "%APP_NAME%" -c "EXIT"
48
49=== modified file 'sounds.res'
50--- sounds.res 2011-05-26 12:04:35 +0000
51+++ sounds.res 2011-06-14 15:57:09 +0000
52@@ -40,18 +40,46 @@
53
54 ;========================================================== Startup music ====
55 ; Sound, duration
56-SND_START dw 1046, 12
57- dw 1175, 04
58- dw 1328, 04
59- dw 1046, 08
60- dw 1175, 04
61- dw 1328, 04
62- dw 1046, 08
63- dw 1175, 04
64- dw 1328, 04
65- dw 1480, 08
66- dw 0, 0
67-
68+SND_START dw 4049, 1
69+ dw 40000, 1
70+ dw 3033, 1
71+ dw 40000, 4
72+ dw 2702, 5
73+ dw 40000, 1
74+ dw 2407, 2
75+ dw 40000, 2
76+ dw 3033, 2
77+ dw 40000, 3
78+ dw 4049, 3
79+ dw 40000, 2
80+ dw 4049, 1
81+ dw 40000, 3
82+ dw 3405, 3
83+ dw 40000, 3
84+ dw 3607, 2
85+ dw 40000, 3
86+ dw 4049, 4
87+ dw 40000, 5
88+ dw 3405, 2
89+ dw 40000, 2
90+ dw 3405, 1
91+ dw 40000, 1
92+ dw 2551, 2
93+ dw 40000, 1
94+ dw 3405, 1
95+ dw 40000, 1
96+ dw 2551, 4
97+ dw 40000, 4
98+ dw 2272, 6
99+ dw 40000, 2
100+ dw 3405, 2
101+ dw 40000, 2
102+ dw 3405, 2
103+ dw 40000, 2
104+ dw 3405, 2
105+ dw 40000, 1
106+ dw 3033, 6
107+ dw 0, 0
108
109
110 ;================================================================== Menus ====
111
112=== modified file 'words.res'
113--- words.res 2011-05-31 13:03:40 +0000
114+++ words.res 2011-06-14 15:57:09 +0000
115@@ -143,7 +143,7 @@
116 db "AGROCHEMICALS$ "
117
118
119-WORD_LIST_FR db "CACHETTERAIENt$ "
120+WORD_LIST_FR db "CACHETTERAIENT$ "
121 db "ECLAIRAGISTES$ "
122 db "QUADRILLERAIENT$ "
123 db "INTUSSUSCEPTION$ "

Subscribers

People subscribed via source and target branches