@@ -126,7 +126,7 @@ embed "assets/v2/display1.png" as img_display1
126
126
fn loadTexture(byte[] imageData) texture {
127
127
let image img = LoadImageFromMemory(".png", imageData, imageData.len)
128
128
let texture t = LoadTextureFromImage(img)
129
- call UnloadImage(img)
129
+ UnloadImage(img)
130
130
ret t
131
131
}
132
132
@@ -140,15 +140,15 @@ fn expandRect(rect@ r, float factor) {
140
140
fn restartGame(cell[][]@ grid, int gxOff, int gyOff, int cellSize, int gridWidth, int gridHeight, bool@ init, bool@ end, bool@ won, bool@ lost, float@ gtime) {
141
141
142
142
for i from 0 until
[email protected] {
143
- call free(grid@[i].ptr)
144
-
143
+ free(grid@[i].ptr)
144
+
145
145
146
146
mut gtime@ = 0
147
147
mut init@ = false
148
148
mut end@ = false
149
149
mut lost@ = false
150
150
mut won@ = false
151
- call SetWindowSize(gxOff*2 + cellSize*gridWidth, gyOff+gxOff+cellSize*gridHeight)
151
+ SetWindowSize(gxOff*2 + cellSize*gridWidth, gyOff+gxOff+cellSize*gridHeight)
152
152
153
153
mut grid@ = &*gridWidth
154
154
for i from 0 until
[email protected] {
@@ -160,7 +160,7 @@ fn restartGame(cell[][]@ grid, int gxOff, int gyOff, int cellSize, int gridWidth
160
160
}
161
161
162
162
fn main() {
163
- call srand(time(0))
163
+ srand(time(0))
164
164
165
165
let int gxOff = 30
166
166
let int gyOff = 150
@@ -172,8 +172,8 @@ fn main() {
172
172
173
173
let float gameTime = 0
174
174
175
- call InitWindow(gxOff*2 + cellSize*gridWidth, gyOff+gxOff+cellSize*gridHeight, "Minesweeper")
176
- call SetTargetFPS(60)
175
+ InitWindow(gxOff*2 + cellSize*gridWidth, gyOff+gxOff+cellSize*gridHeight, "Minesweeper")
176
+ SetTargetFPS(60)
177
177
178
178
let color bg = color!{ 215, 215, 215, 255 }
179
179
@@ -249,7 +249,7 @@ fn main() {
249
249
250
250
251
251
let cell[][] grid = *0
252
- call restartGame(@grid, gxOff, gyOff, cellSize, gridWidth, gridHeight, @isInitialized, @gameEnded, @gameWon, @gameLost, @gameTime)
252
+ restartGame(@grid, gxOff, gyOff, cellSize, gridWidth, gridHeight, @isInitialized, @gameEnded, @gameWon, @gameLost, @gameTime)
253
253
254
254
255
255
@@ -268,7 +268,7 @@ fn main() {
268
268
mut acceptInput = !gameEnded
269
269
270
270
271
- call BeginDrawing()
271
+ BeginDrawing()
272
272
273
273
274
274
# TODO: GetFrameTime() doesnt work for some reason
@@ -279,7 +279,7 @@ fn main() {
279
279
mut gameTime = gameTime + dt
280
280
281
281
282
- call ClearBackground(bg)
282
+ ClearBackground(bg)
283
283
284
284
let rect mouse = rect!{GetMouseX()->float, GetMouseY()->float, 0, 0}
285
285
let bool click = IsMouseButtonPressed(0)
@@ -300,10 +300,10 @@ fn main() {
300
300
let bool hover = CheckCollisionRecs(r, mouse)
301
301
302
302
if hover
303
- call expandRect(@r, focus->float)
303
+ expandRect(@r, focus->float)
304
304
305
305
if hover and click and isInitialized {
306
- call restartGame(@grid, gxOff, gyOff, cellSize, gridWidth, gridHeight, @isInitialized, @gameEnded, @gameLost, @gameWon, @gameTime)
306
+ restartGame(@grid, gxOff, gyOff, cellSize, gridWidth, gridHeight, @isInitialized, @gameEnded, @gameLost, @gameWon, @gameTime)
307
307
continue
308
308
}
309
309
@@ -371,7 +371,7 @@ fn main() {
371
371
if gameWon mut faceT = texFaceWin
372
372
if gameLost mut faceT = texFaceLoss
373
373
374
- call DrawTexturePro(faceT, faceSize, r, origin, 0, tint)
374
+ DrawTexturePro(faceT, faceSize, r, origin, 0, tint)
375
375
376
376
377
377
@@ -396,7 +396,7 @@ fn main() {
396
396
397
397
let float mineCountX = gxOff->float
398
398
let rect mineCountRect = rect!{mineCountX,displayCountY,displayCountWidth,displayCountHeight}
399
- call DrawTexturePro(display1, display1rect, mineCountRect, origin, 0, tint)
399
+ DrawTexturePro(display1, display1rect, mineCountRect, origin, 0, tint)
400
400
401
401
let int remainingMinesTrue = (mineCount - countFlags(grid))
402
402
let int remainingMines = mabs(remainingMinesTrue)
@@ -418,10 +418,10 @@ fn main() {
418
418
let float digitGap = 7
419
419
let float mineCountDigitsWidth = digitWidth*4 + digitGap*3
420
420
let float mineCountDigitXOffset = mineCountX + (displayCountWidth - mineCountDigitsWidth)/2
421
- call DrawTexturePro(digits[rmThou], digitSize, rect!{mineCountDigitXOffset + digitGap*0 + digitWidth*0,digitY,digitWidth,digitHeight},origin,0,tint)
422
- call DrawTexturePro(digits[rmHndr], digitSize, rect!{mineCountDigitXOffset + digitGap*1 + digitWidth*1,digitY,digitWidth,digitHeight},origin,0,tint)
423
- call DrawTexturePro(digits[rmTens], digitSize, rect!{mineCountDigitXOffset + digitGap*2 + digitWidth*2,digitY,digitWidth,digitHeight},origin,0,tint)
424
- call DrawTexturePro(digits[rmOnes], digitSize, rect!{mineCountDigitXOffset + digitGap*3 + digitWidth*3,digitY,digitWidth,digitHeight},origin,0,tint)
421
+ DrawTexturePro(digits[rmThou], digitSize, rect!{mineCountDigitXOffset + digitGap*0 + digitWidth*0,digitY,digitWidth,digitHeight},origin,0,tint)
422
+ DrawTexturePro(digits[rmHndr], digitSize, rect!{mineCountDigitXOffset + digitGap*1 + digitWidth*1,digitY,digitWidth,digitHeight},origin,0,tint)
423
+ DrawTexturePro(digits[rmTens], digitSize, rect!{mineCountDigitXOffset + digitGap*2 + digitWidth*2,digitY,digitWidth,digitHeight},origin,0,tint)
424
+ DrawTexturePro(digits[rmOnes], digitSize, rect!{mineCountDigitXOffset + digitGap*3 + digitWidth*3,digitY,digitWidth,digitHeight},origin,0,tint)
425
425
426
426
427
427
@@ -430,7 +430,7 @@ fn main() {
430
430
431
431
let float timeCountX = (gxOff+gridWidth*cellSize)->float - displayCountWidth
432
432
let rect timeCountRect = rect!{timeCountX,displayCountY,displayCountWidth,displayCountHeight}
433
- call DrawTexturePro(display1, display1rect, timeCountRect, origin, 0, tint)
433
+ DrawTexturePro(display1, display1rect, timeCountRect, origin, 0, tint)
434
434
435
435
let int intTime = (gameTime-0.5)->int
436
436
let int seconds = intTime %% 60
@@ -463,13 +463,13 @@ fn main() {
463
463
}
464
464
}
465
465
466
- call DrawTexturePro(digits[minutesTens], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*0 + digitWidth*0,digitY,digitWidth,digitHeight},origin,0,tint)
467
- call DrawTexturePro(digits[minutesOnes], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*1 + digitWidth*1,digitY,digitWidth,digitHeight},origin,0,tint)
466
+ DrawTexturePro(digits[minutesTens], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*0 + digitWidth*0,digitY,digitWidth,digitHeight},origin,0,tint)
467
+ DrawTexturePro(digits[minutesOnes], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*1 + digitWidth*1,digitY,digitWidth,digitHeight},origin,0,tint)
468
468
469
- call DrawTexturePro(colonTexture, digitColonSize, rect!{timeCountDigitXOffset + timeDigitGap*2 + digitWidth*2,digitY,timeColonWidth,digitHeight},origin,0,tint)
469
+ DrawTexturePro(colonTexture, digitColonSize, rect!{timeCountDigitXOffset + timeDigitGap*2 + digitWidth*2,digitY,timeColonWidth,digitHeight},origin,0,tint)
470
470
471
- call DrawTexturePro(digits[secondsTens], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*3 + timeColonWidth + digitWidth*2,digitY,digitWidth,digitHeight},origin,0,tint)
472
- call DrawTexturePro(digits[secondsOnes], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*4 + timeColonWidth + digitWidth*3,digitY,digitWidth,digitHeight},origin,0,tint)
471
+ DrawTexturePro(digits[secondsTens], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*3 + timeColonWidth + digitWidth*2,digitY,digitWidth,digitHeight},origin,0,tint)
472
+ DrawTexturePro(digits[secondsOnes], digitSize, rect!{timeCountDigitXOffset + timeDigitGap*4 + timeColonWidth + digitWidth*3,digitY,digitWidth,digitHeight},origin,0,tint)
473
473
}
474
474
475
475
@@ -483,11 +483,11 @@ fn main() {
483
483
let bool hover = CheckCollisionRecs(r, mouse)
484
484
485
485
if hover
486
- call expandRect(@r, focus->float)
486
+ expandRect(@r, focus->float)
487
487
488
488
if acceptInput {
489
489
if hover and click and !isInitialized {
490
- call populateGrid(grid, i, j, mineCount)
490
+ populateGrid(grid, i, j, mineCount)
491
491
mut isInitialized = true
492
492
}
493
493
@@ -501,7 +501,7 @@ if acceptInput {
501
501
502
502
mut gameLost = !result
503
503
mut gameWon = !gameLost and checkWin(grid)
504
- if gameWon call flagAllMines(grid)
504
+ if gameWon flagAllMines(grid)
505
505
506
506
mut gameEnded = gameLost or gameWon
507
507
@@ -532,11 +532,11 @@ if acceptInput {
532
532
mut t = texIncorrectFlag
533
533
}
534
534
535
- call DrawTexturePro(t, tileSize, r, origin, 0, tint)
535
+ DrawTexturePro(t, tileSize, r, origin, 0, tint)
536
536
}
537
537
}
538
538
539
- call EndDrawing()
539
+ EndDrawing()
540
540
}
541
541
}
542
542
@@ -674,7 +674,7 @@ fn recursivelyOpen(cell[][] grid, int x, int y) bool {
674
674
675
675
for i from -1 until 2 {
676
676
for j from -1 until 2 {
677
- call recursivelyOpen(grid, x+i, y+j)
677
+ recursivelyOpen(grid, x+i, y+j)
678
678
}
679
679
}
680
680
0 commit comments