# HG changeset patch # User nemo # Date 1243989323 0 # Node ID ffa64983dc072f2b5cbbbe39a1386a6861ce9033 # Parent f70cd51704c133c106122b18f4ca3dd00957a398 typos - the fix for zoom in uMisc.pas appears to be screwing up flakes and other things. commenting it out for now diff -r f70cd51704c1 -r ffa64983dc07 hedgewars/uMisc.pas --- a/hedgewars/uMisc.pas Tue Jun 02 19:02:54 2009 +0000 +++ b/hedgewars/uMisc.pas Wed Jun 03 00:35:23 2009 +0000 @@ -333,8 +333,8 @@ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf); -glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); -glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); +//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR) end; @@ -451,8 +451,8 @@ if SDL_MustLock(surf) then SDL_UnlockSurface(surf); -glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); -glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); +//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR) end; diff -r f70cd51704c1 -r ffa64983dc07 share/hedgewars/Data/Locale/en.txt --- a/share/hedgewars/Data/Locale/en.txt Tue Jun 02 19:02:54 2009 +0000 +++ b/share/hedgewars/Data/Locale/en.txt Wed Jun 03 00:35:23 2009 +0000 @@ -52,7 +52,7 @@ ; Hog (%1) died 02:00=%1 has kicked the bucket! 02:00=%1 has seen the light! -02:00=%1 never saw that comming! +02:00=%1 never saw that coming! ; Hog (%1) drowned 02:01=%1 plays submarine! 02:01=%1 mimics the Titanic! @@ -65,7 +65,7 @@ ; Round ends (draw; unused atm) 02:04=... ; New health crate -02:05=Incomming aid! +02:05=Incoming aid! ; New ammo crate 02:06=More weapons! ; New utility crate @@ -75,4 +75,4 @@ ; Hog (%1) hurts himself only 02:09=%1 should practice aiming! 02:09=%1 seems to hate himself. -02:09=%1 is standing on the wrong side! \ No newline at end of file +02:09=%1 is standing on the wrong side!